tests/test-grep.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 29 Mar 2006 10:27:16 -0800
changeset 2019 ced2d3620f95
parent 1148 fad2d091c74f
child 2868 81f351c5264d
permissions -rw-r--r--
add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1148
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     1
port:4:export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     2
port:4:vaportight
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     3
port:4:import/export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     4
FIXME: history is wrong here
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     5
port:1:1:-:eggs:import
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     6
port:1:2:+:eggs:vaportight
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     7
port:1:3:+:eggs:import/export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     8
port:0:2:+:spam:export
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
     9
port:0:1:+:spam:import
fad2d091c74f Add test-grep.out file for now.
bos@serpentine.internal.keyresearch.com
parents:
diff changeset
    10
port:4:import/export