Re: [fossil-users] backout a merge

[Gé Weijers]

 After you merge in changes from a different branch, but before you check
 in the merge, is there any way to back out the merge?  fossil revert
 undoes the changes but leaves the files edited, although with no
 changes.

fossil undo

type fossil help undo for an explanation

Ge'
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] backout a merge

[Jeff Rogers]

Hi all,

After you merge in changes from a different branch, but before you check 
in the merge, is there any way to back out the merge?  fossil revert 
undoes the changes but leaves the files edited, although with no 
changes.

Alternately, is there a way to preview what a merge will do without 
actually doing the merge?

Here's what happens when I try to revert a merge:
$ fossil changes
$ fossil merge dev2
UPDATE rb
$ fossil diff
Index: rb
===
--- rb
+++ rb
@@ -1,3 +1,3 @@
-the line 1
+that line 1
  line 2
  line 3

$ fossil revert
REVERTED: rb
fossil undo is available to undo the changes shown above.
$ fossil changes
EDITED rb
$ fossil diff
Index: rb
===
--- rb
+++ rb

$

This is fossil version [4a094f46ad] 2010-11-01 18:52:37 UTC

Thanks,
-J
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Re: [fossil-users] backout a merge

[Lluís Batlle i Rossell]

On Mon, Nov 08, 2010 at 11:05:14AM -0800, Jeff Rogers wrote:
 Hi all,
 
 After you merge in changes from a different branch, but before you check 
 in the merge, is there any way to back out the merge?  fossil revert 
 undoes the changes but leaves the files edited, although with no 
 changes.

You can use fossil checkout to make the files match a given commit.
 
 Alternately, is there a way to preview what a merge will do without 
 actually doing the merge?

After 'merge', nothing gets committed, so you can review the results in your
working directory.

But I'm using something like this for reviews previous to the merge:
$ fossil test-find-pivot branch-to-merge branch-to-be-merged-to
(it returns a commit id)

Then you can do:
$ fossil diff (commit id above) branch-to-merge
to get a diff of the differences. I imagine this is what will be merged, and
that's why I review this.

It may not be what will be merged for some complex branch merges where the
branches are not direct relatives, or there have been cherry-picked commits,
because fossil somehow knows the merge history.

Maybe Richard can point to some place giving information on how fossil knows
the merge history, to understand what exactly it knows and how does it deal
with that information.

Regards,
Lluís.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users