Repeated merge issue
Benoit Boissinot
bboissin at gmail.com
Sat Dec 17 18:18:55 UTC 2005
On 12/17/05, Christian Boos <cboos at neuf.fr> wrote:
> Also, in my scenario/script, I don't think that hg had a problem
> to notice the change because of a "same second/same size" issue,
> because you will have the same outcome if you do the steps manually.
>
> I have now a few days off the net, I'll investigate further why my
> script didn't work as I expected.
>
You're right, there is a bug in localrepo.commit
patch is attached and you're testcase works with the patch (but please
test so we are sure it is fixed).
(i hope you're not offline so you'll enjoy Xmas without worrying about
the bug :)
Benoit
-------------- next part --------------
A non-text attachment was scrubbed...
Name: export.diff
Type: text/x-patch
Size: 1196 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20051217/cefdb79b/attachment-0001.bin>
More information about the Mercurial
mailing list