7 Commits

Author	SHA1	Message	Date
Matt Mackall	70ee1c01f7	rebase: only show "rebase completed" message with -v	2010-05-20 15:15:11 -05:00
Matt Mackall	46429c0cb8	strip: hide unbundle messages by default ... Unbundling is an internal implementation detail for strip, only show them with --verbose.	2010-05-20 13:27:28 -05:00
Matt Mackall	0f3c7b919c	Fix up rebase's handling of strip backups	2010-05-20 12:21:35 -05:00
Matt Mackall	0a1ca665ca	strip: be quiet about temporary internal bundle	2010-05-19 19:46:39 -05:00
Christian Boos	62e4f8e6b2	rebase: make sure the newancestor is used during the whole update ... (issue1561) Before this change, newancestor was used only once as a replacement for ancestor.ancestor, but merge.update calls ancestor.ancestor several times, so it ends up with the "wrong" ancestor (the real ancestor, but we want the parent of the rebased changeset for all but the first rebased changeset). Added a new test case for this: test-rebase-newancestor. Also, in one scenario in test-rebase-collapse, there was a spurious conflict caused by the same issue, so that test case was fixed by removing the now unneeded conflict resolution and the output was adapted accordingly.	2009-11-09 20:15:49 +01:00
Stefano Tortarolo	9061d953b4	rebase: avoid redundant merges (issue1301)	2008-09-16 17:51:14 +02:00
Stefano Tortarolo	a60c518854	Add rebase extension	2008-08-18 21:16:31 +02:00