Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-23 Thread Remigiusz Modrzejewski
On Feb 23, 2011, at 05:02 , Matt Welland wrote: I still get conflicts where I suspect I would not have in the past (i) but they are no big deal with a little help from xxdiff. Thanks!! (i) I have no defensible evidence for this claim. If anyone thinks it would be interesting I can try

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-22 Thread Mark Janssen
On Mon, Feb 21, 2011 at 6:58 PM, Petr Man p...@madnetwork.org wrote: On Mon, Feb 21, 2011 at 11:35:03AM -0500, Richard Hipp wrote: Please let me know if http://www.fossil-scm.org/fossil/info/9b7a6f80b2 works for you. I guess this closes ticket [427938e2f6]. -- My GnuPG key is at

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-22 Thread Matt Welland
I tested [691fccbaf7] http://www.fossil-scm.org/fossil/info/691fccbaf7 and it seems to work great! I still get conflicts where I suspect I would not have in the past (i) but they are no big deal with a little help from xxdiff. Thanks!! (i) I have no defensible evidence for this claim. If anyone

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-21 Thread Lluís Batlle i Rossell
On Mon, Feb 21, 2011 at 08:23:42AM -0500, Richard Hipp wrote: Just to clearify, by 3-way merge, you mean a graphical merging tool? I ask because Fossil always has done a 3-way merge behind the scenes - it just doesn't show you what it is doing or give you the opportunity to intervene. I

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-21 Thread Matt Welland
Yes, sorry to be unclear. As another listee posted, when the internal 3-way merge fails with conflicts save the three needed files and call the diff tool of the users preference. Even saving the three files with a clear naming convention would be fine. On Mon, Feb 21, 2011 at 6:23 AM, Richard

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-21 Thread Richard Hipp
Please let me know if http://www.fossil-scm.org/fossil/info/9b7a6f80b2 works for you. On Mon, Feb 21, 2011 at 9:10 AM, Matt Welland estifo...@gmail.com wrote: Yes, sorry to be unclear. As another listee posted, when the internal 3-way merge fails with conflicts save the three needed files and

Re: [fossil-users] 3-way merge likely to happen anytime soon?

2011-02-20 Thread Stanislav Paskalev
Search for fossil gdiff, there is support for external differs, and yes, the description is the same as diff and probably should be fixed. Stanislav Paskalev On Mon, Feb 21, 2011 at 3:09 AM, Ron Wilson ronw.m...@gmail.com wrote: I have noticed that at least some other SCMs provide a mechanism