| Wed, 18 Nov 2015 15:11:23 -0800 |
Siddharth Agarwal |
unshelve: add support for custom merge tools
|
file |
diff |
annotate
|
| Wed, 18 Nov 2015 15:04:03 -0800 |
Siddharth Agarwal |
unshelve: add -k as short form of --keep
|
file |
diff |
annotate
|
| Mon, 09 Nov 2015 13:12:35 -0500 |
Matt Harbison |
tests: tolerate differences between Linux and Windows error strings
|
file |
diff |
annotate
|
| Tue, 10 Nov 2015 14:41:14 -0800 |
Christian Delahousse |
shelve: choose where .orig file locations are kept
|
file |
diff |
annotate
|
| Thu, 12 Nov 2015 15:26:30 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Thu, 12 Nov 2015 02:52:19 -0800 |
Pierre-Yves David |
test: enforce generaldelta format with the right option
|
file |
diff |
annotate
|
| Fri, 13 Nov 2015 02:36:30 +0900 |
FUJIWARA Katsunori |
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)
stable
|
file |
diff |
annotate
|
| Thu, 15 Oct 2015 20:32:01 -0400 |
timeless |
test-shelve: do not use non-portable pipe-and
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
merge: make in-memory changes visible to external update hooks
|
file |
diff |
annotate
|
| Sat, 17 Oct 2015 01:15:34 +0900 |
FUJIWARA Katsunori |
hook: centralize passing HG_PENDING to external hook process
|
file |
diff |
annotate
|
| Wed, 14 Oct 2015 20:35:06 -0700 |
Christian Delahousse |
shelve: delete shelve statefile on any exception during abort
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Thu, 08 Oct 2015 01:41:30 +0900 |
FUJIWARA Katsunori |
bookmarks: use recordchange instead of writing if transaction is active
|
file |
diff |
annotate
|
| Thu, 01 Oct 2015 15:08:00 -0700 |
Pierre-Yves David |
shelve: bundle using bundle2 if repository is general delta (issue4862)
|
file |
diff |
annotate
|
| Wed, 15 Jul 2015 04:45:58 +0900 |
FUJIWARA Katsunori |
shelve: omit incorrect 'commit' suggestion at 'hg shelve -i'
|
file |
diff |
annotate
|
| Mon, 13 Jul 2015 23:34:12 +0900 |
FUJIWARA Katsunori |
shelve: keep old backups if timestamp can't decide exact order of them
|
file |
diff |
annotate
|
| Wed, 01 Jul 2015 13:14:03 -0700 |
Colin Chan |
shelve: only keep the latest N shelve backups
|
file |
diff |
annotate
|
| Wed, 01 Jul 2015 13:13:02 -0700 |
Colin Chan |
shelve: always backup shelves instead of deleting them
|
file |
diff |
annotate
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
file |
diff |
annotate
|
| Thu, 21 May 2015 14:57:30 -0700 |
Laurent Charignon |
selve: make 'shelve --interactive' not experimental
|
file |
diff |
annotate
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
file |
diff |
annotate
|
| Tue, 14 Apr 2015 16:23:54 -0400 |
Tony Tung |
shelve: allow --patch and --stat without --list for a single shelf
|
file |
diff |
annotate
|
| Mon, 27 Apr 2015 15:36:10 -0700 |
Laurent Charignon |
shelve: make the interactive mode experimental
stable
|
file |
diff |
annotate
|
| Wed, 25 Mar 2015 15:53:30 -0700 |
Laurent Charignon |
shelve: add interactive mode
|
file |
diff |
annotate
|
| Wed, 25 Mar 2015 15:52:28 -0700 |
Laurent Charignon |
shelve: add interactive mode command line option
|
file |
diff |
annotate
|
| Mon, 09 Mar 2015 12:32:29 -0400 |
Tristan Seligmann |
test-shelve: be more lenient about whitespace (issue4124)
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Tue, 23 Dec 2014 16:12:54 -0800 |
Martin von Zweigbergk |
trydiff: simplify checking for additions
|
file |
diff |
annotate
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: show warning when rebase creates no changes to commit
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
file |
diff |
annotate
|
| Tue, 04 Nov 2014 23:41:46 +0900 |
Yuya Nishihara |
tests: write hgrc of more than two lines by using shell heredoc
|
file |
diff |
annotate
|
| Tue, 14 Oct 2014 13:34:25 -0700 |
Durham Goode |
obsolete: update tests to use obsolete options
|
file |
diff |
annotate
|
| Mon, 13 Oct 2014 17:55:45 -0500 |
Matt Mackall |
rebase: move duplicatecopies next to merge
|
file |
diff |
annotate
|
| Fri, 10 Oct 2014 12:15:46 -0500 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 08 Oct 2014 07:47:11 -0400 |
Jordi Gutiérrez Hermoso |
shelve: don't delete "." when rebase is a no-op (issue4398)
stable
|
file |
diff |
annotate
|
| Thu, 31 Jul 2014 15:52:56 -0700 |
Pierre-Yves David |
revert: also track clean files
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 10:47:03 -0500 |
Matt Mackall |
tests: fixup issue markers to make check-commit happy
|
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
|
| Fri, 20 Jun 2014 16:15:38 +0900 |
FUJIWARA Katsunori |
shelve: accept '--edit' like other commands creating new changeset
|
file |
diff |
annotate
|
| Thu, 05 Jun 2014 22:20:32 +0900 |
FUJIWARA Katsunori |
shelve: add option combination tests for refactoring in succeeding patch
|
file |
diff |
annotate
|
| Mon, 26 May 2014 11:44:58 -0700 |
Pierre-Yves David |
merge: drop the quotes around commit description
|
file |
diff |
annotate
|
| Fri, 23 May 2014 13:10:31 -0700 |
Siddharth Agarwal |
resolve: don't abort resolve -l even when no merge is in progress
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:55:56 -0700 |
Durham Goode |
rebase: specify custom conflict marker labels for rebase (BC)
|
file |
diff |
annotate
|
| Thu, 08 May 2014 16:50:22 -0700 |
Durham Goode |
merge: add conflict marker formatter (BC)
|
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
|
| Fri, 18 Apr 2014 19:08:32 -0700 |
Gregory Szorc |
resolve: abort when not applicable (BC)
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
tests: make unshelve tests more tricky - don't depend on size change
|
file |
diff |
annotate
|
| Mon, 07 Apr 2014 23:10:20 +0200 |
Mads Kiilerich |
shelve: introduce secret option for using fixed date for temporary commit
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 22:56:10 +0100 |
Simon Heimberg |
tests: rewrite path in test-shelve.t for not being mangled on msys
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:54:40 +0100 |
Mads Kiilerich |
shelve: better (and slightly redundant) test coverage for unshelve conflicts
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:54:27 +0100 |
Mads Kiilerich |
shelve: status messages from unshelve
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:54:12 +0100 |
Mads Kiilerich |
shelve: be quiet when unshelve pulls from the shelve bundle
|
file |
diff |
annotate
|
| Mon, 10 Feb 2014 00:53:27 +0100 |
Mads Kiilerich |
shelve: add 'changes to' prefix to default shelve message
|
file |
diff |
annotate
|
| Tue, 26 Nov 2013 16:30:52 -0800 |
Durham Goode |
unshelve: add tests for unknown files
stable
|
file |
diff |
annotate
|
| Thu, 07 Nov 2013 20:36:26 -0800 |
David Soria Parra |
shelve: unshelve using an unfiltered repository
stable
|
file |
diff |
annotate
|
| Sun, 13 Oct 2013 08:38:30 -0400 |
Johan Bjork |
patch: ensure valid git diffs if source/destination file is missing (issue4046)
stable
|
file |
diff |
annotate
|
| Tue, 29 Oct 2013 01:03:43 +0900 |
FUJIWARA Katsunori |
shelve: disallow commit while unshelve is in progress
stable
|
file |
diff |
annotate
|
| Wed, 23 Oct 2013 13:12:48 -0700 |
Durham Goode |
shelve: use rebase instead of merge (issue4068)
stable
|
file |
diff |
annotate
|
| Tue, 22 Oct 2013 12:41:05 +0900 |
Takumi IINO |
shelve: make unshelve work even if it don't run in repository root
stable
|
file |
diff |
annotate
|