Commits

Augie Fackler committed aea6bfd

test-fold-non-commute: deal with hg output ordering changes

  • Participants
  • Parent commits fe927de

Comments (0)

Files changed (2)

tests/test-histedit-fold-non-commute

 echo % fix up
 echo a > e
 hg add e
-HGEDITOR=cat hg histedit --continue 2>&1 | fixbundle
+cat > cat.py <<EOF
+import sys
+print open(sys.argv[1]).read()
+print
+print
+EOF
+HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed'
 
 echo
 echo % just continue this time
 hg histedit --continue 2>&1 | fixbundle
 
+
 echo % log after edit
 hg log --graph
 

tests/test-histedit-fold-non-commute.out

 % fix up
 d
 ***
-does not commute with e0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+does not commute with e
+
+
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 file e already exists
 1 out of 1 hunks FAILED -- saving rejects to file e.rej