diff options
| author | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
|---|---|---|
| committer | Lukas Gorris <lukas.gorris@gmail.com> | 2009-03-30 21:20:14 +0200 |
| commit | a93dfebb9e7a34ffba9b1ae5e8e496dfab4c3c43 (patch) | |
| tree | 6c38a4617c92398269e6603a0509fc3006811368 /recipes/bazaar/files/import_dirarg.patch | |
| parent | 4255898da29e7e0c521d064afedbc4075b3e8155 (diff) | |
| parent | d7fdcef3d8c8b80926d579c2db179b594429cebe (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/bazaar/files/import_dirarg.patch')
| -rw-r--r-- | recipes/bazaar/files/import_dirarg.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/recipes/bazaar/files/import_dirarg.patch b/recipes/bazaar/files/import_dirarg.patch new file mode 100644 index 0000000000..101be58b56 --- /dev/null +++ b/recipes/bazaar/files/import_dirarg.patch @@ -0,0 +1,53 @@ +--- bazaar-1.2.orig/src/baz/tests/test-import-baz.sh ++++ bazaar-1.2/src/baz/tests/test-import-baz.sh +@@ -23,7 +23,9 @@ + tla init-tree --nested jane@example.com--2003/hello-world--mainline--1.0 + tla id-tagging-method explicit + tla add hello-world.c README +-tla import -L 'initial import' ++cd .. ++tla import -d hello-world--mainline--1.0 -L 'initial import' ++cd hello-world--mainline--1.0 + tla categories -A jane@example.com--2003 >&2 + test "$(tla categories -A jane@example.com--2003)" = "hello-world" + test "$(tla branches jane@example.com--2003/hello-world)" = "hello-world--mainline" +--- bazaar-1.2.orig/src/baz/commands/import.c ++++ bazaar-1.2/src/baz/commands/import.c +@@ -32,7 +32,7 @@ + + + +-static t_uchar * usage = N_("[options] [directory] [archive]/version"); ++static t_uchar * usage = N_("[options] [directory] [[archive]/version]"); + + #define OPTS(OP) \ + OP (opt_help_msg, "h", "help", 0, \ +@@ -42,12 +42,14 @@ + OP (opt_version, "V", "version", 0, \ + N_("Display a release identifier string\n" \ + "and exit.")) \ ++ OP (opt_dir, "d", "dir DIR", 1, \ ++ N_("Change to DIR first.")) \ + OP (opt_log, "l", "log FILE", 1, \ + N_("Commit with log file FILE.")) \ + OP (opt_summary, "s", "summary TEXT", 1, \ + N_("log with summary TEXT plus log-for-merge output") ) \ + OP (opt_automatic, "a", "automatic", 0, \ +- N_("Initialise dir as a working tree, add all source-looking files in dir and import.") ) \ ++ N_("Initialise dir as a working tree, add all source-looking files in dir and import. This requires version to operate.") ) \ + OP (opt_log_msg, "L", "log-message TEXT", 1, \ + N_("log with TEXT")) + +@@ -157,6 +159,12 @@ + safe_printfmt (2, "ill-formed argument for `%s' (`%s')\n", option->opt_string, option->arg_string); + goto usage_error; + ++ case opt_dir: ++ { ++ automatic = 0; ++ break; ++ } ++ + case opt_log: + { + log_file = str_save (0, option->arg_string); |