| Tue, 18 Oct 2016 14:15:15 -0500 |
Kevin Bullock |
merge default into stable for 4.0 code freeze
stable 4.0-rc
|
file |
diff |
annotate
|
| Mon, 17 Oct 2016 17:12:24 +0200 |
Mads Kiilerich |
largefiles: fix 'deleted' files sometimes persistently appearing with R status
stable
|
file |
diff |
annotate
|
| Sun, 16 Oct 2016 02:29:45 +0200 |
Mads Kiilerich |
largefiles: more safe handling of interruptions while updating modifications
stable
|
file |
diff |
annotate
|
| Sun, 16 Oct 2016 02:26:38 +0200 |
Mads Kiilerich |
largefiles: test coverage of fatal interruption of update
stable
|
file |
diff |
annotate
|
| Sat, 08 Oct 2016 01:25:28 -0700 |
Simon Farnsworth |
merge: use labels in subrepo merge
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 05:56:40 -0700 |
Simon Farnsworth |
merge: always use other, not remote, in user prompts
|
file |
diff |
annotate
|
| Fri, 12 Aug 2016 06:01:42 -0700 |
Simon Farnsworth |
merge: use labels in prompts to the user
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: use portable diff script via extdiff extension
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: make chunk header of external diff glob-ed for portability
|
file |
diff |
annotate
|
| Mon, 08 Feb 2016 18:29:17 +0900 |
FUJIWARA Katsunori |
tests: omit -p for external diff via extdiff extension for portability
|
file |
diff |
annotate
|
| Wed, 03 Feb 2016 15:12:01 +0000 |
Pierre-Yves David |
update: warn about other topological head in pull and unbundle
|
file |
diff |
annotate
|
| Tue, 02 Feb 2016 14:49:02 +0000 |
Pierre-Yves David |
update: warn about other topological heads on bare update
|
file |
diff |
annotate
|
| Sun, 17 Jan 2016 17:23:32 +0100 |
Mads Kiilerich |
largefiles: fix commit of missing largefiles
|
file |
diff |
annotate
|
| Thu, 14 Jan 2016 13:33:08 -0800 |
Danek Duvall |
tests: non-GNU mv can't move a file onto a hardlink of itself
|
file |
diff |
annotate
|
| Tue, 05 Jan 2016 22:46:04 +0000 |
timeless |
transplant: correct language to use working directory
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 20:41:40 +0000 |
timeless |
rebase: hook afterresolvedstates
|
file |
diff |
annotate
|
| Mon, 30 Nov 2015 13:43:55 -0800 |
Siddharth Agarwal |
filemerge: add a 'leave unresolved' option to change/delete prompts
|
file |
diff |
annotate
|
| Mon, 12 Oct 2015 19:22:34 +0200 |
Mads Kiilerich |
largefiles: better handling of merge of largefiles that not are available
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Wed, 11 Jul 2012 20:48:51 -0400 |
Matt Harbison |
extdiff: use archiver to take snapshots of committed revisions
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 18:38:02 +0100 |
Mads Kiilerich |
largefiles: make linear update set unsure largefiles normal if unchanged
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 18:38:02 +0100 |
Mads Kiilerich |
debugdirstate: don't hide date field with --nodate, just show 'set'/'unset'
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Thu, 01 Jan 2015 16:47:14 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Wed, 31 Dec 2014 14:46:03 +0100 |
Mads Kiilerich |
largefiles: backout f72d73937853 - linear updates handle m -> a differently
stable 3.2.4
|
file |
diff |
annotate
|
| Wed, 31 Dec 2014 14:45:02 +0100 |
Mads Kiilerich |
tests: add test coverage for lfdirstate invalidation of linear update
stable
|
file |
diff |
annotate
|
| Thu, 11 Dec 2014 21:21:21 -0800 |
Martin von Zweigbergk |
merge: move cd/dc prompts after largefiles prompts
|
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, 25 Nov 2014 17:30:05 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 25 Nov 2014 18:37:28 +0900 |
FUJIWARA Katsunori |
largefiles: avoid exec-bit examination on the platform being unaware of it
stable
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 00:48:41 +0900 |
FUJIWARA Katsunori |
largefiles: move "copyalltostore" invocation into "markcommitted"
|
file |
diff |
annotate
|
| Sat, 08 Nov 2014 00:48:41 +0900 |
FUJIWARA Katsunori |
largefiles: update standins only at the 1st commit of "transplant --continue"
|
file |
diff |
annotate
|
| Wed, 05 Nov 2014 23:24:47 +0900 |
FUJIWARA Katsunori |
largefiles: update standins only at the 1st commit of "hg rebase --continue"
|
file |
diff |
annotate
|
| Tue, 28 Oct 2014 01:14:12 +0900 |
FUJIWARA Katsunori |
largefiles: add examination of exec bit in "hg status --rev REV" case
stable
|
file |
diff |
annotate
|
| Tue, 28 Oct 2014 01:14:11 +0900 |
FUJIWARA Katsunori |
largefiles: ignore removal status of files not managed in the target context
stable
|
file |
diff |
annotate
|
| Mon, 20 Oct 2014 22:08:08 +0900 |
FUJIWARA Katsunori |
tests: add "(glob)" for l10n messages in test-largefiles-update.t for Windows
stable
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 01:08:17 +0200 |
Mads Kiilerich |
subrepo: remove superfluous newline from subrepo prompt
|
file |
diff |
annotate
|
| Wed, 01 Oct 2014 01:04:18 +0200 |
Mads Kiilerich |
ui: show prompt choice if input is not a tty but is forced to be interactive
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: update largefiles even if transplant is aborted by conflict
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: update largefiles even if rebase is aborted by conflict
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:26 +0900 |
FUJIWARA Katsunori |
largefiles: unlink standins not known to the restored dirstate at rollback
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:25 +0900 |
FUJIWARA Katsunori |
largefiles: restore standins according to restored dirstate
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:25 +0900 |
FUJIWARA Katsunori |
largefiles: restore standins from non branch-tip parent at rollback correctly
|
file |
diff |
annotate
|
| Sun, 24 Aug 2014 23:47:25 +0900 |
FUJIWARA Katsunori |
largefiles: omit restoring standins if working parent is not rollbacked
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: update lfdirstate for unchanged largefiles during linear merging
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: keep largefiles from colliding with normal one during linear merge
|
file |
diff |
annotate
|
| Fri, 15 Aug 2014 20:28:51 +0900 |
FUJIWARA Katsunori |
largefiles: add test for large/normal conflict at linear merging
|
file |
diff |
annotate
|
| Mon, 11 Aug 2014 22:29:43 +0900 |
FUJIWARA Katsunori |
largefiles: synchronize lfdirstate with dirstate after automated committing
|
file |
diff |
annotate
|
| Mon, 11 Aug 2014 22:29:43 +0900 |
FUJIWARA Katsunori |
largefiles: drop orphan entries from lfdristat at "hg rollback"
|
file |
diff |
annotate
|
| Mon, 11 Aug 2014 22:29:43 +0900 |
FUJIWARA Katsunori |
largefiles: restore R status of removed largefiles correctly at "hg rollback"
|
file |
diff |
annotate
|
| Wed, 23 Jul 2014 00:10:24 +0900 |
FUJIWARA Katsunori |
largefiles: use "normallookup" on "lfdirstate" while reverting
stable
|
file |
diff |
annotate
|
| Wed, 23 Jul 2014 00:10:24 +0900 |
FUJIWARA Katsunori |
largefiles: invoke "normallookup" on "lfdirstate" for merged files
stable
|
file |
diff |
annotate
|
| Tue, 22 Jul 2014 23:59:34 +0900 |
FUJIWARA Katsunori |
largefiles: use "normallookup", if "mtime" of standin is unset
stable
|
file |
diff |
annotate
|