Tue, 25 Feb 2014 20:29:46 +0100 |
Mads Kiilerich |
merge: use the right ancestor when both sides copied the same file
|
changeset |
files
|
Tue, 25 Feb 2014 20:29:14 +0100 |
Mads Kiilerich |
copies: when both sides made the same copy, report it as a copy
|
changeset |
files
|
Sun, 02 Mar 2014 18:36:02 +0100 |
Mads Kiilerich |
merge: handle create+delete prompts in calculateupdates
|
changeset |
files
|
Fri, 28 Feb 2014 02:26:03 +0100 |
Mads Kiilerich |
merge: handle acceptremove of create+delete early in manifest merge
|
changeset |
files
|
Sun, 02 Mar 2014 18:30:41 +0100 |
Mads Kiilerich |
largefiles: override calculateupdates instead of manifestmerge
|
changeset |
files
|
Tue, 25 Feb 2014 20:28:40 +0100 |
Mads Kiilerich |
tests: add systematic test of merge ancestor calculation
|
changeset |
files
|
Sun, 02 Mar 2014 18:25:19 +0100 |
Mads Kiilerich |
tests: add test case for criss cross merge
|
changeset |
files
|
Mon, 03 Mar 2014 15:34:09 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
Mon, 03 Mar 2014 12:54:46 -0800 |
Lucas Moscovicz |
revset: changed generatorset code to remove unnecesary function call
|
changeset |
files
|
Mon, 03 Mar 2014 15:50:45 +0900 |
Yuya Nishihara |
phase: say "Returns 0" instead of "Return 0" like other command help
stable
|
changeset |
files
|
Mon, 03 Mar 2014 15:50:41 +0900 |
Yuya Nishihara |
dirstate: remove double imports of errno
|
changeset |
files
|
Mon, 03 Mar 2014 15:50:51 +0900 |
Yuya Nishihara |
cmdserver: mask return code of runcommand in the same way as dispatch.run
|
changeset |
files
|
Mon, 03 Mar 2014 15:50:48 +0900 |
Yuya Nishihara |
cmdserver: include non-zero return code of runcommand in test output
|
changeset |
files
|
Mon, 03 Mar 2014 19:41:30 +0900 |
Yuya Nishihara |
cmdserver: recreate mq object on runcommand in case queue path was changed
|
changeset |
files
|
Mon, 03 Mar 2014 19:41:26 +0900 |
Yuya Nishihara |
cmdserver: reload mq on each runcommand request to avoid corruption
|
changeset |
files
|
Mon, 03 Mar 2014 19:41:23 +0900 |
Yuya Nishihara |
localrepo: add hook point to invalidate everything on each command-server run
|
changeset |
files
|
Mon, 03 Mar 2014 23:37:59 +0530 |
anuraggoel |
paper: overlapping of section title on help pages (issue4051)
stable
|
changeset |
files
|
Sat, 01 Mar 2014 20:08:41 -0600 |
Matt Mackall |
contrib: drop tmplrewrite
|
changeset |
files
|
Sat, 01 Mar 2014 19:51:22 -0600 |
Matt Mackall |
extensions: mark win32text deprecated
|
changeset |
files
|
Sat, 01 Mar 2014 19:44:14 -0600 |
Matt Mackall |
extensions: remove interhg
|
changeset |
files
|
Sat, 01 Mar 2014 16:20:15 -0600 |
Matt Mackall |
extensions: remove the inotify extension (BC)
|
changeset |
files
|
Sat, 01 Mar 2014 21:08:43 -0500 |
Augie Fackler |
merge main and crew
|
changeset |
files
|
Sat, 01 Mar 2014 21:08:28 -0500 |
Augie Fackler |
merge with stable
|
changeset |
files
|
Sat, 01 Mar 2014 09:30:23 -0500 |
Augie Fackler |
merge with mpm
|
changeset |
files
|
Sat, 01 Mar 2014 09:21:45 -0500 |
Augie Fackler |
test-help.t: fix for non-Linux platforms
|
changeset |
files
|
Sat, 01 Mar 2014 15:22:49 -0600 |
Matt Mackall |
Added signature for changeset b96cb15ec9e0
stable
|
changeset |
files
|
Sat, 01 Mar 2014 15:22:30 -0600 |
Matt Mackall |
Added tag 2.9.1 for changeset b96cb15ec9e0
stable
|
changeset |
files
|
Sat, 01 Mar 2014 18:09:39 +0100 |
Mads Kiilerich |
merge: audit the right destination file when merging with dir rename
stable 2.9.1
|
changeset |
files
|
Mon, 03 Feb 2014 02:09:46 -0500 |
Augie Fackler |
setup: specify --prefix="" for install-home-bin to avoid badness with defaults
|
changeset |
files
|
Sat, 16 Nov 2013 08:57:08 -0800 |
Durham Goode |
revset: add 'only' revset
|
changeset |
files
|
Thu, 06 Feb 2014 17:42:08 -0800 |
Lucas Moscovicz |
revset: added basic operators to orderedlazyset
|
changeset |
files
|
Thu, 06 Feb 2014 09:28:41 -0800 |
Lucas Moscovicz |
revset: changed revset code to use filter method
|
changeset |
files
|
Thu, 06 Feb 2014 17:18:11 -0800 |
Lucas Moscovicz |
revset: added filter method to revset classes
|
changeset |
files
|
Wed, 05 Feb 2014 15:24:08 -0800 |
Lucas Moscovicz |
revset: added orderedlazyset class
|
changeset |
files
|
Thu, 27 Feb 2014 23:17:37 -0600 |
Matt Mackall |
config: make repo optional again
|
changeset |
files
|
Fri, 28 Feb 2014 02:28:12 +0100 |
Olle Lundberg |
merge: fix spelling of length
|
changeset |
files
|
Mon, 10 Feb 2014 07:13:10 +0400 |
Alexander Drozdov |
ui: edit(): transplant: set HGREVISION environment variable for an editor
|
changeset |
files
|
Thu, 06 Feb 2014 12:21:20 +0400 |
Alexander Drozdov |
ui: edit(): rebase, graft: set HGREVISION environment variable for an editor
|
changeset |
files
|
Thu, 06 Feb 2014 10:15:20 +0400 |
Alexander Drozdov |
cmdutil: make commitforceeditor() to pass revision extras to ui.edit()
|
changeset |
files
|
Thu, 06 Feb 2014 11:38:28 +0400 |
Alexander Drozdov |
ui: allow edit() to work with revision extras
|
changeset |
files
|
Fri, 14 Feb 2014 00:36:44 +0100 |
Simon Heimberg |
tests: glob match has a glob character for not getting a warning on windows
|
changeset |
files
|
Sun, 16 Feb 2014 23:41:24 +0100 |
Simon Heimberg |
run-tests: fixed warn detection on failures with too many output
|
changeset |
files
|
Sun, 16 Feb 2014 23:36:02 +0100 |
Simon Heimberg |
run-tests: fixed warn detection on detecting warn only for lines
|
changeset |
files
|
Thu, 27 Feb 2014 20:01:28 -0800 |
Pierre-Yves David |
obsolete: extract encoding of marker for pushkey from the list key function
|
changeset |
files
|
Wed, 19 Feb 2014 13:46:49 -0800 |
Danek Duvall |
solaris: diff -u emits "No differences encountered"
|
changeset |
files
|
Fri, 14 Feb 2014 00:34:20 +0100 |
Simon Heimberg |
rebase: do not raise an UnboundLocalError when called wrong (issue4106)
|
changeset |
files
|
Thu, 27 Feb 2014 19:56:36 -0800 |
Siddharth Agarwal |
exchange: fix docs for pulloperation
|
changeset |
files
|
Thu, 27 Feb 2014 18:57:03 -0600 |
Matt Mackall |
merge with stable
|
changeset |
files
|
Tue, 25 Feb 2014 18:45:01 -0800 |
Pierre-Yves David |
resolve: use "other" changeset from merge state (issue4163)
stable
|
changeset |
files
|
Tue, 25 Feb 2014 18:54:47 -0800 |
Pierre-Yves David |
merge: add "other" file node in the merge state file
stable
|
changeset |
files
|
Thu, 27 Feb 2014 14:14:57 -0800 |
Pierre-Yves David |
merge: infer the "other" changeset when falling back to v1 format
stable
|
changeset |
files
|
Tue, 25 Feb 2014 18:42:11 -0800 |
Pierre-Yves David |
merge: record the "other" node in merge state
stable
|
changeset |
files
|
Tue, 25 Feb 2014 18:37:06 -0800 |
Pierre-Yves David |
merge: introduce new format for the state file
stable
|
changeset |
files
|
Thu, 27 Feb 2014 12:59:41 -0800 |
Pierre-Yves David |
merge: change the merge state serialisation to use a record based logic
stable
|
changeset |
files
|
Tue, 25 Feb 2014 17:14:49 -0800 |
Pierre-Yves David |
merge: move merge state file path into a constant
stable
|
changeset |
files
|
Thu, 13 Feb 2014 09:18:16 -0800 |
Lucas Moscovicz |
revset: changed spanset __add__ implementation to work lazily
|
changeset |
files
|
Thu, 13 Feb 2014 09:00:25 -0800 |
Lucas Moscovicz |
revset: changed lazyset __add__ implementation to work lazily
|
changeset |
files
|
Tue, 25 Feb 2014 10:32:54 -0800 |
Pierre-Yves David |
obsstore: add a __len__ method
|
changeset |
files
|
Tue, 25 Feb 2014 10:21:54 -0800 |
Pierre-Yves David |
obsstore: `create` method return True if a marker is actually added
|
changeset |
files
|
Thu, 27 Feb 2014 15:31:44 -0600 |
Matt Mackall |
merge with crew
|
changeset |
files
|