equal
deleted
inserted
replaced
378 copy from new |
378 copy from new |
379 copy to copy |
379 copy to copy |
380 diff --git a/new b/copy |
380 diff --git a/new b/copy |
381 copy from new |
381 copy from new |
382 copy to copy |
382 copy to copy |
|
383 % test file addition in slow path |
383 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
384 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
384 created new head |
385 created new head |
385 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
386 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
386 popping bar |
387 popping bar |
387 adding branch |
388 adding branch |
413 rename from foo |
414 rename from foo |
414 rename to baz |
415 rename to baz |
415 2 baz (foo) |
416 2 baz (foo) |
416 diff --git a/bar b/bar |
417 diff --git a/bar b/bar |
417 diff --git a/foo b/baz |
418 diff --git a/foo b/baz |
418 |
419 % test file move chains in the slow path |
419 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
420 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
420 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
421 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
421 popping bar |
422 popping bar |
422 adding branch |
423 adding branch |
423 adding changesets |
424 adding changesets |