| Wed, 07 Oct 2015 22:58:52 -0700 |
Siddharth Agarwal |
filemerge: move 'merging' output to before file creation
|
| Wed, 07 Oct 2015 21:21:56 -0700 |
Siddharth Agarwal |
filemerge.filemerge: make a tuple containing merge paths on disk
|
| Wed, 07 Oct 2015 16:14:57 -0700 |
Siddharth Agarwal |
filemerge: switch trymerge boolean to mergetype enum
|
| Wed, 07 Oct 2015 15:13:41 -0700 |
Siddharth Agarwal |
filemerge: add some merge types
|
| Thu, 08 Oct 2015 01:41:30 +0900 |
FUJIWARA Katsunori |
shelve: restore unshelved dirstate explicitly after aborting transaction
|
| Thu, 08 Oct 2015 01:41:30 +0900 |
FUJIWARA Katsunori |
shelve: restore shelved dirstate explicitly after aborting transaction
|
| Thu, 08 Oct 2015 01:41:30 +0900 |
FUJIWARA Katsunori |
shelve: add utility to abort current transaction but keep dirstate
|
| Thu, 08 Oct 2015 01:41:30 +0900 |
FUJIWARA Katsunori |
dirstate: split write to write changes into files other than .hg/dirstate
|
| Thu, 08 Oct 2015 01:41:30 +0900 |
FUJIWARA Katsunori |
bookmarks: use recordchange instead of writing if transaction is active
|
| Wed, 07 Oct 2015 00:27:23 -0700 |
Siddharth Agarwal |
filemerge: run symlink check for :merge3
|
| Wed, 07 Oct 2015 00:24:44 -0700 |
Siddharth Agarwal |
filemerge: print correct name of tool for symlink checks
|
| Wed, 07 Oct 2015 00:01:16 -0700 |
Siddharth Agarwal |
filemerge: normalize 'internal:foo' names to ':foo'
|
| Tue, 06 Oct 2015 22:57:21 -0700 |
Siddharth Agarwal |
filemerge: use symlinkcheck for :merge and :union
|
| Tue, 06 Oct 2015 22:56:33 -0700 |
Siddharth Agarwal |
filemerge: add a precheck for symlinks
|
| Tue, 06 Oct 2015 22:55:21 -0700 |
Siddharth Agarwal |
filemerge: call precheck if available
|
| Tue, 06 Oct 2015 22:54:14 -0700 |
Siddharth Agarwal |
filemerge: add a before-merge callback to internal merge tools
|
| Tue, 06 Oct 2015 17:39:13 -0700 |
Siddharth Agarwal |
filemerge: indent filemerge.filemerge
|
| Thu, 01 Oct 2015 20:15:00 -0700 |
Pierre-Yves David |
test-bundle-type: replace unbundle with debugbundle
|
| Thu, 01 Oct 2015 18:01:24 -0700 |
Pierre-Yves David |
bundle: extract the parsing of the bundle type in a function
|
| Thu, 01 Oct 2015 19:14:47 -0700 |
Pierre-Yves David |
changegroup: add version argument to getchangegroup
|
| Thu, 01 Oct 2015 19:14:33 -0700 |
Pierre-Yves David |
changegroup: add version argument to getlocalchangegroup
|
| Thu, 01 Oct 2015 15:08:00 -0700 |
Pierre-Yves David |
shelve: bundle using bundle2 if repository is general delta (issue4862)
|
| Thu, 01 Oct 2015 15:09:32 -0700 |
Pierre-Yves David |
shelve: move changegroup generation inside writebundle
|
| Tue, 29 Sep 2015 17:14:30 -0700 |
Pierre-Yves David |
shelve: compress on-disk bundle
|
| Wed, 07 Oct 2015 13:44:48 -0500 |
Matt Mackall |
merge with stable
|
| Mon, 05 Oct 2015 10:43:16 -0600 |
Bruce Cran |
notify: fix fromauthor setting for 'incoming' hook type (issue4194)
stable
|
| Mon, 05 Oct 2015 12:37:26 -0400 |
Matt Harbison |
templater: protect word() from crashing on out of range negative value
stable
|
| Fri, 02 Oct 2015 13:00:47 -0700 |
Siddharth Agarwal |
commands: add a new debug command to print merge state
|
| Wed, 30 Sep 2015 21:22:31 -0700 |
Siddharth Agarwal |
merge.mergestate: factor out code to validate v1/v2 records
|
| Tue, 06 Oct 2015 13:19:05 -0700 |
Siddharth Agarwal |
localrepo: prevent wlock from being inherited when a transaction is running
|
