mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
580e131809
Summary: Part of tech debt week; let's make it so any time we reject an update due to conflicts, we print what the conflicts are. Reviewed By: quark-zju Differential Revision: D9784659 fbshipit-source-id: 1ee232b728bb602dbeaa4d2ecbc11016edd48dce
27 lines
649 B
Perl
27 lines
649 B
Perl
$ enable amend rebase
|
|
$ setconfig experimental.updatecheck=noconflict
|
|
|
|
Updating w/ noconflict prints the conflicting changes:
|
|
$ newrepo
|
|
$ hg debugdrawdag <<'EOS'
|
|
> c # c/b = foo
|
|
> | # c/a = bar
|
|
> b # c/z = foo
|
|
> | # c/y = bar
|
|
> | # b/z = base
|
|
> | # b/y = base
|
|
> a
|
|
> EOS
|
|
$ hg up b
|
|
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo "conflict" | tee a b y z
|
|
conflict
|
|
$ hg up c
|
|
abort: 4 conflicting file changes:
|
|
a
|
|
b
|
|
y
|
|
z
|
|
(commit, shelve, update --clean to discard them, or update --merge to merge them)
|
|
[255]
|