Merge requests · mercurial / evolve · GitLab

tests: rebase now produces different "one-line summary" output

!275 · created Nov 03, 2020 by Martin von Zweigbergk
CI fix Pre-reviewed
- Merged
- Approved
updated Nov 12, 2020
release prep for 10.1.0

!272 · created Oct 31, 2020 by Anton Shestakov branch/stable
updated Oct 31, 2020
compatibility branches for 10.1.0

!273 · created Oct 31, 2020 by Anton Shestakov branch/mercurial-4.6
updated Oct 31, 2020
Fixing test-evolve-public-content-divergent-discard.t right

!250 · created Sep 19, 2020 by Pierre-Yves David branch/stable
- Merged
- 4
updated Oct 28, 2020
fixes from default grafted onto stable

!267 · created Oct 23, 2020 by Anton Shestakov branch/stable
CI fix
updated Oct 28, 2020
make tests use "$PYTHON" more

!268 · created Oct 24, 2020 by Anton Shestakov
- Merged
- 2
updated Oct 28, 2020
add "merging metadata" section for content-divergence

!264 · created Oct 14, 2020 by Pierre-Yves David
- Merged
- 5
- Approved
updated Oct 23, 2020
Fix TypeError caused by the `ngtip` revset returning a node instead of a rev [new MR because I moved the topic to a new branch]

!266 · created Oct 16, 2020 by Sietse Brouwer branch/stable
Pre-reviewed
- Merged
- 5
updated Oct 20, 2020
topic: add a `exp….topic.linear-merge` option to allow some oedipus

!265 · created Oct 14, 2020 by Pierre-Yves David
Pre-reviewed
- Merged
- 24
- Approved
updated Oct 20, 2020
readme: fix syntax of format-source link

!262 · created Oct 12, 2020 by Sietse Brouwer branch/stable
Pre-reviewed
- Merged
- 4
- Approved
updated Oct 15, 2020
tests: {successorssets} now always return a list, affecting json output

!263 · created Oct 12, 2020 by Martin von Zweigbergk
- Merged
- 1
updated Oct 14, 2020
discovery: list the new heads like core does when failing a multi-head push

!248 · created Sep 17, 2020 by Matt Harbison
Pre-reviewed
- Merged
- 7
- Approved
updated Oct 09, 2020
khanchi refactor cdiv

!224 · created Aug 24, 2020 by Sushil Khanchi
Pre-reviewed
- Merged
- 15
updated Oct 09, 2020
Topic/default/evolve dirstate parents

!255 · created Sep 25, 2020 by Martin von Zweigbergk
Pre-reviewed
- Merged
- 1
updated Oct 09, 2020
evolve: update docstring for mergeusers()

!252 · created Sep 22, 2020 by Sushil Khanchi
Pre-reviewed
- Merged
- 2
updated Oct 09, 2020
Topic/default/compat merge update

!257 · created Oct 02, 2020 by Martin von Zweigbergk
CI fix
updated Oct 02, 2020
compat: add support for upstream rename of merge.update() to _update()

!254 · created Sep 25, 2020 by Martin von Zweigbergk
CI fix Pre-reviewed
- Merged
- Approved
updated Sep 28, 2020
tests: conditonalize a Windows only output in test-evolve-progress.t

!253 · created Sep 24, 2020 by Pierre-Yves David branch/stable
- Merged
- 2
updated Sep 28, 2020
ci: drop extraneous space

!251 · created Sep 19, 2020 by Pierre-Yves David
Pre-reviewed
updated Sep 19, 2020
tests: graphlog now only shows '%' if there are unresolved conflicts

!245 · created Sep 17, 2020 by Anton Shestakov
Blocked CI fix
- Merged
- 3
- Approved
updated Sep 17, 2020

Prev
1
…
12
13
14
15
16
17
18
19
20
…
25
Next