Mercurial > hg

diff tests/test-rebase-conflicts.t @ 35384:b9bdee046cc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add a simple test for in-memory rebase This is just a very simple start, but verifies some of the basic cases of an in-memory rebase. Differential Revision: https://phab.mercurial-scm.org/D1652
author Phil Cohen <phillco@fb.com>
date Sun, 10 Dec 2017 22:39:46 -0800
parents a0100f34e20b
children 4441705b7111
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Mon Dec 11 22:38:31 2017 +0900
+++ b/tests/test-rebase-conflicts.t	Sun Dec 10 22:39:46 2017 -0800
@@ -235,6 +235,7 @@
   
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
   rebase onto 4bc80088dc6b starting from e31216eec445
+  rebasing on disk
   rebase status stored
   rebasing 9:e31216eec445 "more changes to f1"
    future parents are 2 and -1