- Jun 08, 2010
-
-
Stefano Tortarolo authored
When a changeset is skipped, rebase keeps the previous target as next target and if the skipped cset is the first one, the recorded target is actually the original target. --abort did not detect this situation but simply stripped away the cset.
-
- Jun 04, 2010
-
-
Matt Mackall authored
-
- May 20, 2010
-
-
Matt Mackall authored
Suggested by Dirk Hasselbalch
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- May 17, 2010
-
-
Martin Geisler authored
-
Martin Geisler authored
-
- Mar 23, 2010
-
-
Patrick Mezard authored
-
Patrick Mezard authored
This was broken in 38fe86fb16e3.
-
- Mar 13, 2010
-
-
Benoit Boissinot authored
-
- Feb 07, 2010
-
-
Stefano Tortarolo authored
This option is useful when other extensions (e.g., pbranch) want to use rebase --collapse and append other things before committing. This is not intended to be used from command line.
-
- Mar 13, 2010
-
-
Patrick Mezard authored
-
- Mar 02, 2010
-
-
Greg Ward authored
Previously, it only checked for an mq patch if the user explicitly passed -d/--dest. But rebasing onto an mq patch is a bad idea regardless of how we determine the rebase destination.
-
- Mar 11, 2010
-
-
Martin Geisler authored
-
Martin Geisler authored
They are not needed inside triple-quoted strings and they confuse the line number computation done in i18n/hggettext. The script tries to find the docstring in the source file. When \" in the source is turned into just " in the docstring, the docstring can no longer be found.
-
Dirkjan Ochtman authored
-
- Mar 10, 2010
-
-
Greg Ward authored
- add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options
-
Greg Ward authored
- add a paragraph about default dest/source changesets - option help: say "changeset" not "revision" - option help: explain -b/--base better - clarify that -a/--abort and -c/--continue are different from the other options
-
Sune Foldager authored
-
- Feb 12, 2010
-
-
Stefano Tortarolo authored
-
- Feb 09, 2010
-
-
Matt Mackall authored
-
- Feb 06, 2010
-
-
Stefano Tortarolo authored
When rebasing an intermediate revision, rebase keeps a parent relationship with the original parent. This option forces the removal of this relationship. In more depth, it 'fakes' null merges between the target revision and the ancestors of source, dropping every change from the ancestors. The result is that every change in source and its descendants will be rebased, ignoring the changes in its ancestors.
-
- Jan 31, 2010
-
-
Stefano Tortarolo authored
Separate rebase-specific functions, in order to provide a better base to extend rebase's capabilities. Note that this will be useful especially to share functions with 'adapt'.
-
- Jan 20, 2010
-
-
Matt Mackall authored
-
- 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.
-
- Oct 15, 2009
-
-
Martin Geisler authored
-
- Oct 14, 2009
-
-
timeless authored
-
- Oct 08, 2009
-
-
Sune Foldager authored
This only happens when using --base (or no source selection options), as rebase already aborts in this situation when using --source. Without this change you get an abort from the underlying merge, and the repository is in a different state than you started with (the working dir parent is changed).
-
Sune Foldager authored
-
- Sep 18, 2009
-
-
Martin Geisler authored
-
- Aug 02, 2009
-
-
Martin Geisler authored
This new page has the usual user-oriented information about the extension.
-
- Jul 25, 2009
-
-
Martin Geisler authored
-
- Jul 22, 2009
-
-
Martin Geisler authored
-
Martin Geisler authored
It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.
-
- Jul 07, 2009
-
-
Martin Geisler authored
-
- Jun 24, 2009
-
-
Dirkjan Ochtman authored
-
Dirkjan Ochtman authored
-
- Jun 01, 2009
-
-
Matt Mackall authored
-
Matt Mackall authored
-