gistfile1.txt

--- /mnt/vex/default_pkg/test-patch-submitted_citc-client_sh.runfiles/google3/devtools/piper/hgfission/e2e/tests/test-patch-submitted.t
+++ /tmp/vex/test_tmp/mercurial_env/test-patch-submitted.t#citc-client.err
@@ -245,19 +245,17 @@
   adding manifests
   adding file changes
   added 4 changesets with 0 changes to 0 files (+4 heads)
-  8 new obsolescence markers
-  obsoleted 3 changesets
-  4 new orphan changesets
-  2 new content-divergent changesets
+  7 new obsolescence markers
+  obsoleted 1 changesets
+  6 new orphan changesets
+  4 new content-divergent changesets
   new changesets [0-9a-f]+:[0-9a-f]+ \(4 drafts\) (re)
   (3 other changesets obsolete on arrival)
-  update:[0-9a-f]+ cl/CL3 <patched> "commit file3" (re)
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at [0-9a-f]+ (re)
-  move:[0-9a-f]+ cl/CL2 <submitted> "commit file2" (re)
+  move:101bd4b3 cl/CL2 <patched> "commit file2"
   atop:[0-9a-f]+ cl/CL1 <submitted> "commit file1" (re)
   move:[0-9a-f]+ cl/CL3 <patched> "commit file3" (re)
-  move:[0-9a-f]+ cl/CL4 tip <patched> "commit file4" (re)
+  atop:bd7a3100 <submitted> "commit file2"
+  skipping daef863fe6e1: divergent rewriting. can't choose destination
   working directory is now at [0-9a-f]+ (re)
   CL CL1 patched in as commit [0-9a-f]+ (re)
   CL CL2 patched in as commit [0-9a-f]+ (re)