| Tue, 23 Oct 2012 16:53:11 +0200 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| Tue, 23 Oct 2012 16:49:29 +0200 |
Pierre-Yves David |
mercurial: replace all `newerversion` call by `successorsset` call
stable
|
file |
diff |
annotate
|
| Tue, 23 Oct 2012 16:36:29 +0200 |
Pierre-Yves David |
evolve: smarter code for divergent changeset
stable
|
file |
diff |
annotate
|
| Tue, 23 Oct 2012 15:44:24 +0200 |
Pierre-Yves David |
evolve: rename conflicting into divergent
stable
|
file |
diff |
annotate
|
| Tue, 23 Oct 2012 15:05:32 +0200 |
Pierre-Yves David |
evolve: detect and abort if 2.4 is detected
stable
|
file |
diff |
annotate
|
| Tue, 23 Oct 2012 15:03:25 +0200 |
Pierre-Yves David |
evolve: add tested with info
stable
|
file |
diff |
annotate
|
| Wed, 10 Oct 2012 15:26:09 +0200 |
Pierre-Yves David |
evolve: drop code now in core
|
file |
diff |
annotate
|
| Wed, 10 Oct 2012 14:58:21 +0200 |
Pierre-Yves David |
evolve: filter nullid successors
stable
|
file |
diff |
annotate
|
| Thu, 27 Sep 2012 16:55:08 +0200 |
Pierre-Yves David |
evolve: new divergent revset
stable
|
file |
diff |
annotate
|
| Wed, 19 Sep 2012 15:28:35 +0200 |
Pierre-Yves David |
adapt to core rebase support
stable
|
file |
diff |
annotate
|
| Wed, 19 Sep 2012 17:30:07 +0200 |
Pierre-Yves David |
rebase: warn about troubles created by rebase
stable
|
file |
diff |
annotate
|
| Fri, 14 Sep 2012 15:36:29 +0200 |
Pierre-Yves David |
hg prune: prevent empty call
stable
|
file |
diff |
annotate
|
| Wed, 12 Sep 2012 14:24:23 +0200 |
Pierre-Yves David |
fold: handle the lack of revision to fold
stable
|
file |
diff |
annotate
|
| Tue, 11 Sep 2012 13:51:24 +0200 |
Pierre-Yves David |
commit --amend: adap to core 63e45aee46d4
stable
|
file |
diff |
annotate
|
| Tue, 11 Sep 2012 12:38:49 +0200 |
Pierre-Yves David |
createmarkers: adapt to f85816af6294 in core
stable
|
file |
diff |
annotate
|
| Tue, 11 Sep 2012 12:30:22 +0200 |
Pierre-Yves David |
warning: work around phase limitation when computing warnings
stable
|
file |
diff |
annotate
|
| Tue, 11 Sep 2012 12:19:13 +0200 |
Pierre-Yves David |
caches: now in core adapt to fb72eec7efd8
stable
|
file |
diff |
annotate
|
| Tue, 11 Sep 2012 11:45:00 +0200 |
Pierre-Yves David |
evolve-cmd: fix merge error detection for external tools.
stable
|
file |
diff |
annotate
|
| Mon, 10 Sep 2012 18:56:44 +0200 |
Pierre-Yves David |
Properly update after fold
stable
|
file |
diff |
annotate
|
| Mon, 10 Sep 2012 18:22:45 +0200 |
Pierre-Yves David |
fix hg pull --rebase
stable
|
file |
diff |
annotate
|
| Mon, 10 Sep 2012 17:33:06 +0200 |
Pierre-Yves David |
fix missing --dest evolve output in dryrun
stable
|
file |
diff |
annotate
|
| Thu, 30 Aug 2012 22:05:05 +0200 |
Patrick Mezard |
evolve: fixing syntax/grammar
stable
|
file |
diff |
annotate
|
| Thu, 30 Aug 2012 21:47:09 +0200 |
Pierre-Yves David |
hgweb: disable branchtip filtering for hgweb
stable
|
file |
diff |
annotate
|
| Thu, 30 Aug 2012 13:54:43 +0200 |
Aurelien Campeas |
a better msg for this tricky situation
stable
|
file |
diff |
annotate
|
| Thu, 30 Aug 2012 13:50:17 +0200 |
Pierre-Yves David |
test conflicting conflicting (sic) resolution
stable
|
file |
diff |
annotate
|
| Mon, 27 Aug 2012 14:57:20 +0200 |
Pierre-Yves David |
doc: long desc update
stable
|
file |
diff |
annotate
|
| Sun, 26 Aug 2012 12:04:16 +0200 |
Pierre-Yves David |
Conditionnaly add the `hidden` revset symbol
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 14:43:34 +0200 |
Pierre-Yves David |
ensure all file have a copyright notice
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 09:45:03 +0200 |
Patrick Mezard |
evolve: usual syntax/grammar errors/long lines cleanup
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 09:32:05 +0200 |
Patrick Mezard |
evolve: simplify locking in _solveconflicting()
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 09:18:40 +0200 |
Patrick Mezard |
fold: simplify locking
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 09:20:15 +0200 |
Patrick Mezard |
touch: simplify locking pattern
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 08:51:37 +0200 |
Patrick Mezard |
evolve: factor out copy/paste in obssummary()
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 08:30:02 +0200 |
Patrick Mezard |
evolve: avoid 'any' argument name in _picknexttroubled()
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 08:26:28 +0200 |
Patrick Mezard |
evolve: localrepo.revs() already returns a list
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 08:20:50 +0200 |
Patrick Mezard |
evolve: compute "troubled" revs in stabilize only when necessary
stable
|
file |
diff |
annotate
|
| Sat, 25 Aug 2012 08:17:59 +0200 |
Patrick Mezard |
evolve: move _stabilizableunstable() with related functions
stable
|
file |
diff |
annotate
|
| Fri, 24 Aug 2012 19:11:49 +0200 |
Pierre-Yves David |
evolve: add touch and fold to command that may create troubles
stable
|
file |
diff |
annotate
|
| Fri, 24 Aug 2012 11:52:49 +0200 |
Pierre-Yves David |
evolve: add the odiff alias
|
file |
diff |
annotate
|
| Fri, 24 Aug 2012 11:17:18 +0200 |
Pierre-Yves David |
rename `stabilize` to `evolve`
|
file |
diff |
annotate
|
| Fri, 24 Aug 2012 10:44:23 +0200 |
Pierre-Yves David |
merge evolve and obsolete
|
file |
diff |
annotate
|
| Thu, 23 Aug 2012 18:21:18 +0200 |
Pierre-Yves David |
sort import
|
file |
diff |
annotate
|
| Thu, 23 Aug 2012 17:40:28 +0200 |
Pierre-Yves David |
evolve: stabilize now handle conflicting changeset
|
file |
diff |
annotate
|
| Thu, 23 Aug 2012 14:15:36 +0200 |
Pierre-Yves David |
stabilize: conflicting changeset are considered if "."
|
file |
diff |
annotate
|
| Thu, 23 Aug 2012 12:51:06 +0200 |
Pierre-Yves David |
evolve: fold command
|
file |
diff |
annotate
|
| Thu, 23 Aug 2012 12:51:34 +0200 |
Pierre-Yves David |
evolve: touch command
|
file |
diff |
annotate
|
| Tue, 21 Aug 2012 12:47:50 +0200 |
Pierre-Yves David |
merge with stable improvement
|
file |
diff |
annotate
|
| Tue, 21 Aug 2012 12:43:21 +0200 |
Pierre-Yves David |
[evolve] amend: display proper error message while trying to amend non ancestor
stable
|
file |
diff |
annotate
|
| Tue, 21 Aug 2012 12:42:09 +0200 |
Pierre-Yves David |
[evolve] amend: check phase before starting the transition
stable
|
file |
diff |
annotate
|
| Mon, 20 Aug 2012 19:12:20 +0200 |
Pierre-Yves David |
obsolete: use flag to detect that a obsolescence marker fix a latecomer
|
file |
diff |
annotate
|
| Tue, 21 Aug 2012 10:10:44 +0200 |
Pierre-Yves David |
stabilize: handle latecomer
|
file |
diff |
annotate
|
| Mon, 20 Aug 2012 18:59:07 +0200 |
Pierre-Yves David |
stabilize: rework stabilize code to allow selection of latecomer and conflicting
|
file |
diff |
annotate
|
| Mon, 20 Aug 2012 14:40:48 +0200 |
Pierre-Yves David |
stabilize: handle killed changeset in stabilize.
|
file |
diff |
annotate
|
| Mon, 20 Aug 2012 14:13:29 +0200 |
Pierre-Yves David |
stabilize: --continue support !!!
|
file |
diff |
annotate
|
| Mon, 20 Aug 2012 12:31:43 +0200 |
Pierre-Yves David |
stabilize: rename "node" variable to "orig"
|
file |
diff |
annotate
|
| Mon, 20 Aug 2012 12:25:08 +0200 |
Pierre-Yves David |
obsolete Move merge failure handling into stabilize code
|
file |
diff |
annotate
|
| Wed, 08 Aug 2012 16:51:45 +0200 |
Pierre-Yves David |
obsolete: simplify rebase wrapping code and change relation creation
|
file |
diff |
annotate
|
| Tue, 07 Aug 2012 18:53:26 +0200 |
Pierre-Yves David |
obsolete: remove legacy revset
|
file |
diff |
annotate
|
| Tue, 07 Aug 2012 18:26:13 +0200 |
Pierre-Yves David |
drop repo.addobsolete
|
file |
diff |
annotate
|
| Tue, 07 Aug 2012 18:05:41 +0200 |
Pierre-Yves David |
obsolete: remove usage of addcollapsedobsolete
|
file |
diff |
annotate
|