Re: [fossil-users] Renames and multiple merges

2015-06-21 Thread Andy Goth
On 6/4/2015 7:33 PM, Andy Goth wrote: On 6/4/2015 12:44 PM, Andy Goth wrote: On 6/3/2015 8:27 PM, Andy Goth wrote: After renaming files on a branch, Fossil will allow you only one successful merge until it loses track of which files are which. Here's a sequence showing the problem (version

Re: [fossil-users] Renames and multiple merges

2015-06-04 Thread Andy Goth
On 6/4/2015 12:44 PM, Andy Goth wrote: On 6/3/2015 8:27 PM, Andy Goth wrote: After renaming files on a branch, it seems Fossil will allow you only one successful merge until it loses track of which files are which. Here's a sequence showing the problem (version 3ffb6a3e62): [see

Re: [fossil-users] Renames and multiple merges

2015-06-04 Thread Andy Goth
On 6/3/2015 8:27 PM, Andy Goth wrote: After renaming files on a branch, it seems Fossil will allow you only one successful merge until it loses track of which files are which. Here's a sequence showing the problem (version 3ffb6a3e62): [see

[fossil-users] Renames and multiple merges

2015-06-03 Thread Andy Goth
After renaming files on a branch, it seems Fossil will allow you only one successful merge until it loses track of which files are which. Here's a sequence showing the problem (version 3ffb6a3e62): f new merge-rename.fossil mkdir merge-rename cd merge-rename f open ../merge-rename.fossil echo