Source

repoman / tests / output / rebase.py.out

Full commit
Normal rebase
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Checking for local changes... none found
2 changesets found
rebase completed
@  changeset:   3:64c8261125d8
|  branch:      core/dev
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   2:76e99fa61604
|  branch:      core/dev
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   1:11be38c2b8b7
|  branch:      core/dev
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:30 1970 +0000
|  summary:     initial core/dev
|
o  changeset:   0:8759c9b85d97
   branch:      core/stable
   user:        Jane Doe <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial core/stable


Rebase to non-head target, failure
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
abort: source or destination, or both, are not head revisions

Rebase to other head
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Checking for local changes... none found
2 changesets found
rebase completed
@  changeset:   3:83c847da07a1
|  branch:      core/dev
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   2:8fbc88347bc4
|  branch:      core/dev
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   1:11be38c2b8b7
|  branch:      core/dev
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:30 1970 +0000
|  summary:     initial core/dev
|
o  changeset:   0:8759c9b85d97
   branch:      core/stable
   user:        Jane Doe <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial core/stable


Rebase with local changes
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
M foo
Checking for local changes... found some; saving them
3 changesets found
rebase completed
@  changeset:   3:64c8261125d8
|  branch:      core/dev
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   2:76e99fa61604
|  branch:      core/dev
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   1:11be38c2b8b7
|  branch:      core/dev
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:30 1970 +0000
|  summary:     initial core/dev
|
o  changeset:   0:8759c9b85d97
   branch:      core/stable
   user:        Jane Doe <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial core/stable

M foo

Rebase to other branch only when explicit destination specified
reverting foo
Created branch core/test:
a  11be38c2b8b7
b  11be38c2b8b7
c  11be38c2b8b7
Working branch: core/test
Updating to core/dev:
a  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  No update needed
c  No update needed
Updating to core/test:
a  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b  No update needed
c  No update needed
abort: cannot rebase to branch core/dev from branch core/test without explicit --dest option
o  changeset:   3:76e99fa61604
|  branch:      core/dev
|  tag:         tip
|  parent:      1:11be38c2b8b7
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
| @  changeset:   2:cbdc0b4b2dbb
|/   branch:      core/test
|    user:        Jane Doë <jane.doe@rlyeh.org>
|    date:        Thu Jan 01 00:00:00 1970 +0000
|    summary:     commit
|
o  changeset:   1:11be38c2b8b7
|  branch:      core/dev
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:30 1970 +0000
|  summary:     initial core/dev
|
o  changeset:   0:8759c9b85d97
   branch:      core/stable
   user:        Jane Doe <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial core/stable

Checking for local changes... none found
2 changesets found
rebase completed
@  changeset:   3:525949bb0724
|  branch:      core/dev
|  tag:         tip
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   2:76e99fa61604
|  branch:      core/dev
|  user:        Jane Doë <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:00 1970 +0000
|  summary:     commit
|
o  changeset:   1:11be38c2b8b7
|  branch:      core/dev
|  user:        Jane Doe <jane.doe@rlyeh.org>
|  date:        Thu Jan 01 00:00:30 1970 +0000
|  summary:     initial core/dev
|
o  changeset:   0:8759c9b85d97
   branch:      core/stable
   user:        Jane Doe <jane.doe@rlyeh.org>
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     initial core/stable