Re: [fossil-users] merge strategy "ours"

2012-03-21 Thread Leo Razoumov
On Wed, Mar 21, 2012 at 12:23, Themba Fletcher wrote: > On Tue, 2012-03-20 at 15:04 -0400, Leo Razoumov wrote: >> On Tue, Mar 20, 2012 at 09:57, Richard Hipp wrote: >> > >> > Why not just "fossil revert my/file.txt"? >> > >> For each one of dozens of files in the manifest?? > > Does this do what

Re: [fossil-users] merge strategy "ours"

2012-03-21 Thread Themba Fletcher
On Tue, 2012-03-20 at 15:04 -0400, Leo Razoumov wrote: > On Tue, Mar 20, 2012 at 09:57, Richard Hipp wrote: > > > > Why not just "fossil revert my/file.txt"? > > > > For each one of dozens of files in the manifest?? Does this do what you want? fossil merge foo fossil changes | head -n -1 | awk

Re: [fossil-users] merge strategy "ours"

2012-03-20 Thread Leo Razoumov
On Tue, Mar 20, 2012 at 09:57, Richard Hipp wrote: > > Why not just "fossil revert my/file.txt"? > For each one of dozens of files in the manifest?? I tried $ fossil revert and it reverts the contents of all files but at the same time it also removes merge record (clears vmerge table). All I w

Re: [fossil-users] merge strategy "ours"

2012-03-20 Thread Benoit Mortgat
Because I was confusing “ours” and “their”. On Tue, Mar 20, 2012 at 14:57, Richard Hipp wrote: > > > On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat wrote: >> >> The simplest way to let merge conflicts happen, and >> restore versions from an older commit if you know the file artifact ids: >> >>

Re: [fossil-users] merge strategy "ours"

2012-03-20 Thread Richard Hipp
On Tue, Mar 20, 2012 at 9:54 AM, Benoit Mortgat wrote: > The simplest way to let merge conflicts happen, and > restore versions from an older commit if you know the file artifact ids: > > fossil artifact a59bd2322 > my/file.txt > Why not just "fossil revert my/file.txt"? > > On Tue, Mar 20, 20

Re: [fossil-users] merge strategy "ours"

2012-03-20 Thread Benoit Mortgat
The simplest way to let merge conflicts happen, and restore versions from an older commit if you know the file artifact ids: fossil artifact a59bd2322 > my/file.txt On Tue, Mar 20, 2012 at 14:14, Leo Razoumov wrote: > Hi there, > GIT has a useful merge strategy "git merge -s ours" that always >

[fossil-users] merge strategy "ours"

2012-03-20 Thread Leo Razoumov
Hi there, GIT has a useful merge strategy "git merge -s ours" that always chooses our current version over the version being merged in. The resulting merge has exactly the same files contents as its base parent. The only difference being that the commit merged in is now added to the list of merge p