2013/7/10 Stephan Beal <[email protected]>:
> That well surpasses my understanding of how merging is tracked, so i'll just
> be quiet now ;).
Well, merge-tracking is a part of fossil which I understand very
well. So I did just a little bit hacking:
<https://www.fossil-scm.org/index.html/info/b984ecaf1d>
It actually looks much like the "merge --reintegrate" command
in subversion, although I hate the name "reintegrate" (and in
svn, branches cannot be "closed" just "deleted"). This
option became deprecated in subversion 1.8 anyway, see
<http://subversion.apache.org/docs/release-notes/1.8.html#auto-reintegrate>
I would just choose --integrate for it.
Demo:
- prepare a branch "foo" which needs to be integrated to "trunk"
Then from "trunk":
$ fossil merge --integrate foo
UPDATE work/test.txt
"fossil undo" is available to undo changes to the working checkout.
$ fossil status
....
UPDATED_BY_MERGE work/test.txt
INTEGRATE 8be756e01aecba050b67c3ed3f17bd1c196d7d97
$ fossil commit
....
New_Version: 376eed4109c9b179731b54e34032650c24701360
Cannot close 8be756e01aecba050b67c3ed3f17bd1c196d7d97 because it
is not implemented yet
The only thing missing is the actual closing of the branch, but
everything else should be there ;-)
A nice thing is that if you decide not to commit the change, the
integrated branch is never closed. You can do a "fossil undo"
or "fossil revert" and everything is gone.
Regards,
Jan Nijtmans
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
