- Oct 11, 2011
-
-
Matt Mackall authored
-
- Oct 09, 2011
-
-
Matt Mackall authored
-
- Sep 19, 2011
-
-
Pierre-Yves David authored
We only deny rebasing onto direct parent. Thanks to the ancestor argument of merge. the "implementation" of this feature only consist in loosing the check and imply detach when rebasing on ancestor.
-
- Jul 21, 2011
-
-
Augie Fackler authored
-
- 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.
-
- Jul 15, 2011
-
-
Stefano Tortarolo authored
-
- Jun 08, 2011
-
-
Idan Kamara authored
-
- Jun 12, 2011
-
-
Idan Kamara authored
-
- Jun 13, 2011
-
-
Adrian Buehlmann authored
-
Adrian Buehlmann authored
-
- Jun 01, 2011
-
-
Matt Mackall authored
-
- Mar 26, 2011
-
-
Stefano Tortarolo authored
Guards on rebased mq patches were lost. This patch restores them after the qimporting step.
-
- May 27, 2011
-
-
Adrian Buehlmann authored
This makes 'pull --rebase' consistent with the merge command, which already provides that option to control the merges
-
- May 12, 2011
-
-
Adrian Buehlmann authored
-
- May 10, 2011
-
-
Matt Mackall authored
-
- Apr 05, 2011
-
-
Matt Mackall authored
-
- Mar 27, 2011
-
-
Stefano Tortarolo authored
-
- Apr 05, 2011
-
-
Matt Mackall authored
-
- Apr 04, 2011
-
-
Matt Mackall authored
-
Matt Mackall authored
-
Matt Mackall authored
-
- Apr 02, 2011
-
-
Stefano Tortarolo authored
-
- Mar 27, 2011
-
-
Stefano Tortarolo authored
-
- Mar 26, 2011
-
-
Stefano Tortarolo authored
Guards on rebased mq patches were lost. This patch restores them after the qimporting step.
-
- Mar 23, 2011
-
-
Stefano Tortarolo authored
So far we've been denying rebasing descendants onto ancestors, but there are situations in which this kind of operation makes perfect sense to me. Let's say we have made a commit (or more), that belongs to branch 'dev', on top of the named branch 'stable': ... a (stable) - b (dev) but then we realize that b should belong to branch 'stable'. In these cases a rebase means: "move these csets from named branch A to named branch B" and there isn't a valid reason to deny it. This patch basically doesn't block it, if source and destination are on different named branches. The old behaviour still applies for rebases across the same named branch. Can you think of any tricky corner cases in which this new behaviour could lead to problems? (I bet there are tons of them...) By the way, I created a brand new .t because I feel there should be more tests I can't think of at the moment.
-
- 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>
-
- Mar 13, 2011
-
-
Martin Geisler authored
-
- Jan 02, 2011
-
-
Adrian Buehlmann authored
-
- Nov 20, 2010
-
-
Henrik Stuart authored
-
- Oct 30, 2010
-
-
Steve Borho authored
-
- Oct 26, 2010
-
-
timeless developer authored
-
- Jul 20, 2010
-
-
timeless developer authored
-
- Aug 27, 2010
-
-
Brodie Rao authored
-
- Aug 14, 2010
-
-
Martin Geisler authored
-
- Aug 13, 2010
-
-
Benoit Boissinot authored
-
- Aug 07, 2010
-
-
Alecs King authored
found by a run of check-code
-
- Jul 20, 2010
-
-
timeless developer authored
-
- Jul 13, 2010
-
-
Nicolas Dumazet authored
This should make the MQ API more transparent: callers only have to call save_dirty, and no mq.added magic or knowledge is required.
-
- Jul 12, 2010
-
-
Nicolas Dumazet authored
-
- Jul 13, 2010
-
-
Nicolas Dumazet authored
Since 1b82a26635d7, we are adding patches after the qimport call, and not inside it anymore. Correct updatemq to match the new behaviour.
-