diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/wiggle/wiggle-0.6/004ExtractFix | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/wiggle/wiggle-0.6/004ExtractFix')
| -rw-r--r-- | packages/wiggle/wiggle-0.6/004ExtractFix | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/packages/wiggle/wiggle-0.6/004ExtractFix b/packages/wiggle/wiggle-0.6/004ExtractFix deleted file mode 100644 index 8ab090992d..0000000000 --- a/packages/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 - } - |