| Wed, 03 Dec 2014 14:03:20 -0800 |
Martin von Zweigbergk |
merge: make 'keep' message more descriptive
|
file |
diff |
annotate
|
| Wed, 03 Dec 2014 15:03:29 -0800 |
Martin von Zweigbergk |
graft: use a real conflict for the tests
|
file |
diff |
annotate
|
| Mon, 03 Nov 2014 12:08:03 -0500 |
Matt Harbison |
templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
stable
|
file |
diff |
annotate
|
| Sat, 11 Oct 2014 14:05:09 -0500 |
Matt Mackall |
dirstate: merge falls through to otherparent
|
file |
diff |
annotate
|
| Wed, 27 Aug 2014 18:35:34 +0200 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 27 Aug 2014 15:30:09 +0200 |
Mads Kiilerich |
graft: fix collision detection with origin revisions that are missing
stable
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 14:54:36 -0700 |
Siddharth Agarwal |
graft: make --force apply across continues (issue3220)
|
file |
diff |
annotate
|
| Fri, 25 Jul 2014 18:21:16 -0700 |
Siddharth Agarwal |
graft: allow regrafting ancestors with --force (issue3220)
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Wed, 11 Jun 2014 22:19:29 -0400 |
Matt Harbison |
convert: update the transplant, rebase and graft references in 'extra'
|
file |
diff |
annotate
|
| Sun, 11 May 2014 00:49:36 +0900 |
FUJIWARA Katsunori |
graft: use "getcommiteditor()" instead of explicit editor choice
|
file |
diff |
annotate
|
| Tue, 22 Apr 2014 02:10:25 +0200 |
Mads Kiilerich |
merge: change debug logging - test output changes but no real changes
|
file |
diff |
annotate
|
| Fri, 02 May 2014 01:09:14 +0200 |
Mads Kiilerich |
merge: change priority / ordering of merge actions
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Mon, 28 Apr 2014 17:25:36 -0700 |
Pierre-Yves David |
graft: do not use `.remove` on a smart set (regression)
stable
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 02:12:28 +0200 |
Mads Kiilerich |
merge: let manifestmerge emit 'keep' actions when keeping wd version
|
file |
diff |
annotate
|
| Sun, 02 Mar 2014 18:52:16 +0100 |
Mads Kiilerich |
merge: keep destination filename as key in filemerge actions
|
file |
diff |
annotate
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
file |
diff |
annotate
|
| Thu, 03 Oct 2013 18:01:21 +0200 |
Mads Kiilerich |
graft: make skip messages more helpful
|
file |
diff |
annotate
|
| Mon, 23 Sep 2013 21:31:37 -0700 |
Siddharth Agarwal |
cmdutil.bailifchanged: standardize error message for dirty working dir
|
file |
diff |
annotate
|
| Wed, 24 Jul 2013 23:51:40 -0500 |
Matt Mackall |
commands: add checks for unfinished operations (issue3955)
stable
|
file |
diff |
annotate
|
| Fri, 28 Jun 2013 16:58:31 -0700 |
Siddharth Agarwal |
update: remove .hg/graftstate on clean (issue3970)
stable
|
file |
diff |
annotate
|
| Thu, 30 May 2013 22:32:10 +0100 |
Simon King |
graft: refuse to commit an interrupted graft (issue3667)
stable
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 22:54:17 +0100 |
Mads Kiilerich |
export: show 'Date' header in a format that also is readable for humans
|
file |
diff |
annotate
|
| Sat, 09 Feb 2013 15:22:04 -0800 |
Bryan O'Sullivan |
tests: update test output (will be folded into parent)
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 15:23:23 +0000 |
Siddharth Agarwal |
manifestmerge: pass in branchmerge and force separately
|
file |
diff |
annotate
|
| Thu, 24 Jan 2013 23:57:44 +0100 |
Mads Kiilerich |
merge: delay debug messages for merge actions
|
file |
diff |
annotate
|
| Tue, 15 Jan 2013 02:59:12 +0100 |
Mads Kiilerich |
merge: process files in sorted order
|
file |
diff |
annotate
|
| Wed, 26 Dec 2012 15:03:58 -0800 |
Siddharth Agarwal |
copies: make debug messages more sensible
|
file |
diff |
annotate
|
| Sat, 07 Jul 2012 00:47:55 -0400 |
Matt Harbison |
revset: add destination() predicate
|
file |
diff |
annotate
|
| Sat, 07 Jul 2012 00:47:30 -0400 |
Matt Harbison |
revset: add origin() predicate
|
file |
diff |
annotate
|
| Fri, 29 Jun 2012 00:40:52 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 16 Jun 2012 17:05:55 +0900 |
Yuya Nishihara |
graft: don't drop the second parent on unsuccessful merge (issue3498)
stable
|
file |
diff |
annotate
|
| Wed, 20 Jun 2012 17:02:43 +0200 |
Thomas Arendsen Hein |
graft: allow -r to specify revisions
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Wed, 23 May 2012 21:34:29 +0200 |
Thomas Arendsen Hein |
merge: show renamed on one and deleted on the other side in debug output
|
file |
diff |
annotate
|
| Fri, 11 May 2012 18:51:35 +0200 |
Levi Bard |
graft: implement --log (issue3438)
|
file |
diff |
annotate
|
| Sun, 06 May 2012 14:20:53 -0500 |
Matt Mackall |
filectx: handle some other simple cases for finding merge ancestor
|
file |
diff |
annotate
|
| Sun, 06 May 2012 14:15:17 -0500 |
Matt Mackall |
graft: remark on empty graft
|
file |
diff |
annotate
|
| Sun, 22 Apr 2012 20:06:36 +0200 |
Patrick Mezard |
rebase: skip resolved but emptied revisions
stable
|
file |
diff |
annotate
|
| Sun, 22 Apr 2012 18:27:50 +0200 |
Patrick Mezard |
test-rebase: exhibit revisions which should have been skipped
stable
|
file |
diff |
annotate
|
| Thu, 19 Apr 2012 18:11:48 +0300 |
Idan Kamara |
commands: add missing wlock to graft
stable
|
file |
diff |
annotate
|
| Tue, 10 Apr 2012 12:49:12 -0500 |
Matt Mackall |
graft: add --dry-run support (issue3362)
|
file |
diff |
annotate
|
| Thu, 09 Feb 2012 17:04:17 -0600 |
Matt Mackall |
merge: don't use unknown()
|
file |
diff |
annotate
|
| Tue, 17 Jan 2012 11:08:23 +0100 |
Alain Leufroy |
graft: add test to check the phase of new changesets
|
file |
diff |
annotate
|
| Tue, 17 Jan 2012 20:23:23 +0100 |
Pierre-Yves David |
changeset_printer: display changeset phase on debug level
|
file |
diff |
annotate
|
| Thu, 05 Jan 2012 20:35:10 -0600 |
Matt Mackall |
cmdutil: simplify duplicatecopies
|
file |
diff |
annotate
|
| Fri, 09 Dec 2011 17:34:53 +0100 |
Martin Geisler |
merge: make debug output easier to read
|
file |
diff |
annotate
|
| Thu, 17 Nov 2011 16:53:17 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Sat, 12 Nov 2011 14:00:25 +0100 |
Stefano Tortarolo |
graft: disallow grafting grafted csets in specific situations (issue3091)
stable
|
file |
diff |
annotate
|
| Sat, 12 Nov 2011 11:23:52 +0100 |
Stefano Tortarolo |
graft: use revs to make tests more readable
stable
|
file |
diff |
annotate
|
| Sat, 12 Nov 2011 13:15:40 +0100 |
Stefano Tortarolo |
graft: preserve original source in subsequent grafts
stable
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
file |
diff |
annotate
|
| Mon, 24 Oct 2011 17:01:49 -0500 |
Matt Mackall |
graft: add a test
stable
|
file |
diff |
annotate
|