Hello Richard and friends,
I continue below this old thread, where I still had not found deeper
what was failing in our merges. Now I add more information.
2011/3/3 Richard Hipp d...@sqlite.org:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
Maybe the problem is in the handling of renames,
Hello back,
just to add something to the letter I just sent with all the details,
at the first letter of this thread
http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg03883.html
we mentioned this next proposal as a solution to the problem:
So we propose that, for the merge between
Hello,
we had an issue merging with renames here. The 'test-shortest-path' takes what
we think is a *WRONG* path for the merge to happen.
We had two long-standing branches, that both were updated from trunk from time
to time. One was merged into trunk only recently, altough it has been there for
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
Hello,
we had an issue merging with renames here. The 'test-shortest-path' takes
what
we think is a *WRONG* path for the merge to happen.
We had two long-standing branches, that both were updated from trunk from
time
to time. One was
On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
This could have worked, if the first merge of the end of January did not
have
any rename. It had renames, and due to this, the last merge attempt
complained
about this like
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
This could have worked, if the first merge of the end of January did
not
have
any rename. It had renames, and due to
On Thu, Mar 03, 2011 at 10:57:06AM -0500, Richard Hipp wrote:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
This could have worked, if the first merge of the end of
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
On Thu, Mar 03, 2011 at 10:57:06AM -0500, Richard Hipp wrote:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
On Thu, Mar 03, 2011 at 10:39:11AM -0500, Richard Hipp wrote:
2011/3/3 Lluís Batlle i Rossell virik...@gmail.com
8 matches
Mail list logo
