- Jul 18, 2011
-
-
Stefano Tortarolo authored
Collapse and keepbranches should be blocked when there is more than one named branch on the branch that's going to be rebased.
-
- Apr 30, 2011
-
-
Nicolas Dumazet authored
Add two changesets to the scenario so that the bundle can be reused within three tests. Before: @ 5: 'F' | | o 4: 'E' |/| o | 3: 'D | | | o 2: 'C' |/ | o 1: 'B' |/ o 0: 'A' After: @ 7: 'H' | | o 6: 'G' |/| o | 5: 'F' | | | o 4: 'E' |/ | o 3: 'D' | | | o 2: 'C' | | | o 1: 'B' |/ o 0: 'A' Revisions 0-1 keep the same number/label. Others were translated by an offset of 2 (2.C -> 4.E)
-
- Mar 15, 2011
-
-
Radomir Dopieralski authored
When collapsing changesets with rebase, you get a chance to edit the commit message manually, but there is no way to pass this message from the command line. This patch adds a `--message` (with short form `-m`) and `--logfile` (with short form `-m`) options to the rebase command. These options suppresses the generation of the default commit message, and instead use the message provided in the option (in case of `-m`) or in the file it points to (in case of `-l`). If you use this option without the `--collapse` option, it will raise an error. Options documentation edited by Patrick Mezard <pmezard@gmail.com>
-
- Oct 09, 2010
-
-
kiilerix authored
Many globs now just match $TESTTMP and is no longer needed.
-
- Oct 01, 2010
-
-
Adrian Buehlmann authored
-
- May 21, 2010
-
-
Yuya Nishihara authored
`source` isn't available at POSIX sh.
-
- May 20, 2010
-
-
Matt Mackall authored
-
- Mar 23, 2010
-
-
Patrick Mezard authored
This was broken in 38fe86fb16e3.
-
- Nov 09, 2009
-
-
Christian Boos authored
(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.
-
- Apr 26, 2009
-
-
Martin Geisler authored
The tests are executed with a .hgrc file which adds "-u test" by default.
-
- Sep 16, 2008
-
-
Stefano Tortarolo authored
-
- Aug 20, 2008
-
-
Brendan Cully authored
-
- Aug 18, 2008
-
-
Stefano Tortarolo authored
-