comparison tests/test-merge-symlinks @ 6077:fb259a3572e9

convert: try to be smarter about CVS branching Better handles this case: The output from cvsps -A -u --cvs-direct -q: --------------------- PatchSet 1 Date: 2008/02/08 20:33:28 Author: fk Branch: HEAD Tag: (none) Log: initial Members: file_one:INITIAL->1.1 --------------------- PatchSet 2 Date: 2008/02/08 20:33:32 Author: fk Branch: branch_name Ancestor branch: HEAD Tag: (none) Log: new file on branch Members: file_two:1.1->1.1.2.1
author Matt Mackall <mpm@selenic.com>
date Mon, 11 Feb 2008 16:16:05 -0600
parents 36794dbe66a3
children a6477aa893b8
comparison
equal deleted inserted replaced
6076:0ee885fea464 6077:fb259a3572e9