##// END OF EJS Templates
record: check that we are not committing a merge before patch selection...
record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

File last commit:

r10546:3a69afd6 stable
r11237:feb2a58f stable
Show More
test-branchmap.out
42 lines | 1.1 KiB | text/plain | TextLexer
marked working directory as branch æ
adding foo
listening at http://localhost/ (bound to 127.0.0.1)
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
updating to branch æ
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
changeset: 0:867c11ce77b8
branch: æ
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
pushing to http://localhost:PORT
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
changeset: 1:58e7c90d67cb
branch: æ
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: bar
changeset: 0:867c11ce77b8
branch: æ
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
pushing to ssh://dummy/
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files