Tue, 23 Apr 2019 13:26:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
file |
diff |
annotate
|
Tue, 23 Apr 2019 12:20:12 +0200 |
Pierre-Yves David |
compat: backed out changeset cfcb7eedc666
stable
|
file |
diff |
annotate
|
Wed, 17 Apr 2019 12:31:17 +0530 |
Sushil khanchi |
evolve: improve inline documentation for the public divergence resolution
|
file |
diff |
annotate
|
Thu, 11 Apr 2019 17:45:36 +0800 |
Anton Shestakov |
evolve: store --update flag state in evolvestate file
|
file |
diff |
annotate
|
Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
file |
diff |
annotate
|
Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
file |
diff |
annotate
|
Fri, 05 Apr 2019 17:45:59 +0200 |
Pierre-Yves David |
evolve: fix divergence resolution when not merging a descendant
|
file |
diff |
annotate
|
Wed, 03 Apr 2019 01:00:33 +0530 |
Sushil khanchi |
evolve: refactor the code which swap two nodes (in divergence resolution)
|
file |
diff |
annotate
|
Tue, 02 Apr 2019 18:01:43 +0530 |
Sushil khanchi |
evolve: remove tmpctx arg from _resolvephasedivergent()
|
file |
diff |
annotate
|
Fri, 29 Mar 2019 11:48:36 +0100 |
Pierre-Yves David |
doc: clarify _resolvephasedivergent role and constraint
|
file |
diff |
annotate
|
Tue, 02 Apr 2019 20:32:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
stable
|
file |
diff |
annotate
|
Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
file |
diff |
annotate
|
Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
file |
diff |
annotate
|
Sun, 24 Mar 2019 21:30:12 +0530 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
file |
diff |
annotate
|
Sun, 24 Mar 2019 21:29:44 +0530 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
file |
diff |
annotate
|
Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
file |
diff |
annotate
|
Sat, 09 Mar 2019 19:25:34 +0530 |
Sushil khanchi |
evolve: warn user if cset desc is being lost
|
file |
diff |
annotate
|
Wed, 06 Mar 2019 21:47:08 +0800 |
Anton Shestakov |
evolvecmd: compatibility with older geteffectflag() that took a tuple
|
file |
diff |
annotate
|
Thu, 07 Mar 2019 10:51:48 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Thu, 07 Mar 2019 01:57:43 +0530 |
Sushil khanchi |
evolve: fix a typo from directory to dirty
stable
|
file |
diff |
annotate
|
Thu, 07 Mar 2019 01:47:14 +0530 |
Sushil khanchi |
evolve: fix the dirstate after setting parents with dirty wdir (issue5930)
stable
|
file |
diff |
annotate
|
Mon, 04 Mar 2019 12:30:15 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Mon, 04 Mar 2019 03:16:51 +0530 |
Sushil khanchi |
evolve: make sure user can recover from conflict (issue6053)
stable
|
file |
diff |
annotate
|
Thu, 28 Feb 2019 03:12:39 +0530 |
Sushil khanchi |
evolve: cover continue case in pubdiv when merging results in same as public
|
file |
diff |
annotate
|
Fri, 22 Feb 2019 01:02:51 +0530 |
Sushil khanchi |
evolve: handle a case in pubic-div when merging results in same as public
|
file |
diff |
annotate
|
Thu, 28 Feb 2019 02:08:58 +0530 |
Sushil khanchi |
evolve: rename npublicdiv to publicnode
|
file |
diff |
annotate
|
Thu, 28 Feb 2019 02:02:18 +0530 |
Sushil khanchi |
evolve: in pubdiv resolution make sure that transaction get closed
|
file |
diff |
annotate
|
Mon, 25 Feb 2019 22:50:24 +0530 |
Sushil khanchi |
evolve: pin the public cset to local side in merging when solving public div
|
file |
diff |
annotate
|
Fri, 22 Feb 2019 21:01:06 +0530 |
Sushil khanchi |
evolve: fix the broken behaviour on div resolution in relocation case
|
file |
diff |
annotate
|
Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
|
file |
diff |
annotate
|
Mon, 21 Jan 2019 23:06:10 +0530 |
Sushil khanchi |
evolve: update the public divergence resolution logic to cover --continue case
|
file |
diff |
annotate
|
Mon, 21 Jan 2019 23:06:34 +0530 |
Sushil khanchi |
evolve: add logic to resolve content-divergence with a public cset
|
file |
diff |
annotate
|
Sun, 13 Jan 2019 19:33:19 +0530 |
Sushil khanchi |
evolve: introduce function to create a obsmarker relation even for public cset
|
file |
diff |
annotate
|
Fri, 25 Jan 2019 16:51:36 +0530 |
Sushil khanchi |
evolve: add description of function solveobswdp
|
file |
diff |
annotate
|
Wed, 23 Jan 2019 12:11:36 -0800 |
Martin von Zweigbergk |
evolve: document the "if not shouldupdate" block
|
file |
diff |
annotate
|
Wed, 23 Jan 2019 11:55:20 -0800 |
Martin von Zweigbergk |
evolve: make "startnode" consistently be a node, not a context
|
file |
diff |
annotate
|
Tue, 22 Jan 2019 22:36:29 -0800 |
Martin von Zweigbergk |
evolve: use context managers for locks and transaction
|
file |
diff |
annotate
|
Fri, 18 Jan 2019 23:09:44 +0530 |
Sushil khanchi |
evolve: make sure we don't stop after evolution of obsparent (issue5881)
|
file |
diff |
annotate
|
Fri, 18 Jan 2019 23:08:43 +0530 |
Sushil khanchi |
evolve: extract "update" code into its own function
|
file |
diff |
annotate
|
Tue, 25 Dec 2018 14:35:54 +0530 |
Sushil khanchi |
evolve: cover the orphanmerge part missed by lastsolved
|
file |
diff |
annotate
|
Mon, 14 Jan 2019 09:14:38 -0800 |
Martin von Zweigbergk |
evolve: adapt for deprecated ui.progress()
|
file |
diff |
annotate
|
Mon, 24 Dec 2018 18:38:25 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Fri, 21 Dec 2018 13:14:59 +0800 |
Pierre-Yves David |
evolve: detect unresolved conflict during evolve --continue (issue5966)
stable
|
file |
diff |
annotate
|
Thu, 13 Dec 2018 18:57:49 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Thu, 13 Dec 2018 17:41:06 +0100 |
James Reynolds |
issue-6028: resolves 6028 - return (False, ".") instead of (False, '')
stable
|
file |
diff |
annotate
|
Tue, 27 Nov 2018 03:56:27 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Tue, 27 Nov 2018 03:46:06 +0100 |
Sushil khanchi |
evolve: update the abort to a ProgrammingError
stable
|
file |
diff |
annotate
|
Tue, 20 Nov 2018 11:33:38 -0500 |
Eric Spishak-Thomas |
evolve: fix a documentation typo
stable
|
file |
diff |
annotate
|
Mon, 19 Nov 2018 01:45:34 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for `obsutil.allprecursors` function
|
file |
diff |
annotate
|
Mon, 19 Nov 2018 01:44:28 +0000 |
Pierre-Yves David |
compat: drop 4.3 compatiblity code for `ui.edit` method
|
file |
diff |
annotate
|
Wed, 31 Oct 2018 14:06:17 +0530 |
Sushil khanchi |
evolve: modify and move the comment to appropriate position
|
file |
diff |
annotate
|
Sat, 10 Nov 2018 17:54:28 +0100 |
Pierre-Yves David |
style: silence another flak8 warning
|
file |
diff |
annotate
|
Sat, 10 Nov 2018 15:47:46 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Sat, 10 Nov 2018 15:37:22 +0100 |
Pierre-Yves David |
style: fix various flake8 warning
stable
|
file |
diff |
annotate
|
Sat, 10 Nov 2018 00:55:34 +0100 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
Tue, 06 Nov 2018 10:43:35 +0530 |
Sushil khanchi |
evolvecmd: _possibledestination() skip visiting empty parent
stable
|
file |
diff |
annotate
|
Fri, 26 Oct 2018 12:54:40 +0530 |
Sushil khanchi |
evolve: use stack template in --continue case also
|
file |
diff |
annotate
|