##// END OF EJS Templates
absorb: preserve branch-closing changesets even if empty...
Manuel Jacob -
r45517:bfef35bb default
parent child Browse files
Show More
@@ -889,6 +889,8 class fixupstate(object):
889 pctx = parents[0]
889 pctx = parents[0]
890 if ctx.branch() != pctx.branch():
890 if ctx.branch() != pctx.branch():
891 return False
891 return False
892 if ctx.extra().get(b'close'):
893 return False
892 # ctx changes more files (not a subset of memworkingcopy)
894 # ctx changes more files (not a subset of memworkingcopy)
893 if not set(ctx.files()).issubset(set(memworkingcopy)):
895 if not set(ctx.files()).issubset(set(memworkingcopy)):
894 return False
896 return False
@@ -553,3 +553,37 This should move us to the non-obsolete
553 b | 0
553 b | 0
554 2 files changed, 1 insertions(+), 0 deletions(-)
554 2 files changed, 1 insertions(+), 0 deletions(-)
555
555
556
557 $ cd ..
558 $ hg init repo7
559 $ cd repo7
560 $ echo a1 > a
561 $ touch b
562 $ hg commit -m a -A a b
563 $ echo b > b
564 $ hg commit -m foo --close-branch # will become empty
565 $ echo c > c
566 $ hg commit -m reopen -A c -q
567 $ hg commit -m bar --close-branch # is already empty
568 $ echo a2 > a
569 $ printf '' > b
570 $ hg absorb --apply-changes --verbose | grep became
571 0:0cde1ae39321: 1 file(s) changed, became 4:fc7fcdd90fdb
572 1:651b953d5764: 2 file(s) changed, became 5:0c9de988ecdc
573 2:76017bba73f6: 2 file(s) changed, became 6:d53ac896eb25
574 3:c7c1d67efc1d: 2 file(s) changed, became 7:66520267fe96
575 $ hg up null -q # to make visible closed heads
576 $ hg log -T '{rev} {desc}\n' -G --stat
577 _ 7 bar
578 |
579 o 6 reopen
580 | c | 1 +
581 | 1 files changed, 1 insertions(+), 0 deletions(-)
582 |
583 _ 5 foo
584 |
585 o 4 a
586 a | 1 +
587 b | 0
588 2 files changed, 1 insertions(+), 0 deletions(-)
589
General Comments 0
You need to be logged in to leave comments. Login now