Mercurial > evolve
comparison tests/test-sharing.t @ 1404:848a04c078c7
evolve: add selector for trouble types
This patch adds command line flags to select the kind of troubles to solve.
Before this patch evolve was solving any kind of troubled. With this patch
evolve --all and evolve --rev can be configured to only solve only some type
of troubles (divergent, bumped or unstable). To give this choice to the
user we add three new command line flags to the evolve command: --bumped,
--divergent and --unstable.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Tue, 16 Jun 2015 15:14:37 -0700 |
| parents | aff6bc2a6b2d |
| children | 5f6e78aea094 |
comparison
equal
deleted
inserted
replaced
| 1403:9a8ecfdfa866 | 1404:848a04c078c7 |
|---|---|
| 490 $ hg --hidden shortlog -r 'successors(2fe6)' | 490 $ hg --hidden shortlog -r 'successors(2fe6)' |
| 491 6:a360947f6faf draft fix bug 24 (v2 by bob) | 491 6:a360947f6faf draft fix bug 24 (v2 by bob) |
| 492 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) | 492 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice) |
| 493 | 493 |
| 494 Use evolve to fix the divergence. | 494 Use evolve to fix the divergence. |
| 495 $ HGMERGE=internal:other hg evolve | 495 $ HGMERGE=internal:other hg evolve --divergent |
| 496 merge:[6] fix bug 24 (v2 by bob) | 496 merge:[6] fix bug 24 (v2 by bob) |
| 497 with: [7] fix bug 24 (v2 by alice) | 497 with: [7] fix bug 24 (v2 by alice) |
| 498 base: [4] fix bug 24 (v1) | 498 base: [4] fix bug 24 (v1) |
| 499 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 499 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 500 working directory is now at 5ad6037c046c | 500 working directory is now at 5ad6037c046c |