diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /wiggle/wiggle-0.6/004ExtractFix | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'wiggle/wiggle-0.6/004ExtractFix')
| -rw-r--r-- | wiggle/wiggle-0.6/004ExtractFix | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/wiggle/wiggle-0.6/004ExtractFix b/wiggle/wiggle-0.6/004ExtractFix deleted file mode 100644 index 8ab090992d..0000000000 --- a/wiggle/wiggle-0.6/004ExtractFix +++ /dev/null @@ -1,63 +0,0 @@ -Status: ok - -Fix off-by-one-error when extracting a merge file. - -If a merge ended at EOF, --extract wouldn't interpret it properly. - - ----------- Diffstat output ------------ - ./extract.c | 8 ++++---- - ./p | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff ./extract.c~current~ ./extract.c ---- ./extract.c~current~ 2004-02-03 13:18:41.000000000 +1100 -+++ ./extract.c 2004-02-03 13:18:55.000000000 +1100 -@@ -207,7 +207,7 @@ int split_merge(struct stream f, struct - lineno++; - switch(state) { - case 0: -- if (len>8 && -+ if (len>=8 && - strncmp(cp, "<<<<<<<", 7)==0 && - (cp[7] == ' ' || cp[7] == '\n') - ) { -@@ -222,7 +222,7 @@ int split_merge(struct stream f, struct - } - break; - case 1: -- if (len>8 && -+ if (len>=8 && - strncmp(cp, "|||||||", 7)==0 && - (cp[7] == ' ' || cp[7] == '\n') - ) { -@@ -232,7 +232,7 @@ int split_merge(struct stream f, struct - copyline(&r1, &cp, end); - break; - case 2: -- if (len>8 && -+ if (len>=8 && - strncmp(cp, "=======", 7)==0 && - (cp[7] == ' ' || cp[7] == '\n') - ) { -@@ -242,7 +242,7 @@ int split_merge(struct stream f, struct - copyline(&r2, &cp, end); - break; - case 3: -- if (len>8 && -+ if (len>=8 && - strncmp(cp, ">>>>>>>", 7)==0 && - (cp[7] == ' ' || cp[7] == '\n') - ) { - -diff ./p~current~ ./p ---- ./p~current~ 2004-02-03 13:18:44.000000000 +1100 -+++ ./p 2004-02-03 13:18:55.000000000 +1100 -@@ -170,7 +170,7 @@ commit_one() - { - rm -f "$1~current~" - mv "$1" "$1~current~" -- cp "$1~current~" $1 -+ cp -p "$1~current~" $1 - chmod u+w $1 - } - |