diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-09-14 17:31:33 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2012-09-17 07:07:00 -0700 |
| commit | f7b644df66d5f975d858aca3f977f31baf4a2264 (patch) | |
| tree | fc626cdd0a8d73082321871886a650410d6a46fd /org.eclipse.jgit.pgm | |
| parent | 18e020218b210ef5867bb07ff8f2b889e467d7fc (diff) | |
| download | jgit-f7b644df66d5f975d858aca3f977f31baf4a2264.tar.gz jgit-f7b644df66d5f975d858aca3f977f31baf4a2264.zip | |
Add tests for output result of merging -- org.eclipse.jgit.pgm.Merge
Change-Id: I888c7e80503b869d65a9617e6a07e01d1ff5f197
Diffstat (limited to 'org.eclipse.jgit.pgm')
3 files changed, 5 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties index 9fb0eba8fb..5e38c04bb5 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties @@ -7,6 +7,7 @@ N=N IPZillaPasswordPrompt=IPZilla Password alreadyOnBranch=Already on ''{0}'' +alreadyUpToDate=Already up-to-date. authorInfo=Author: {0} <{1}> averageMSPerRead=average {0} ms/read branchAlreadyExists=A branch named ''{0}'' already exists. @@ -64,7 +65,7 @@ lineFormat=# {0} listeningOn=Listening on {0} mergeConflict=CONFLICT(content): Merge conflict in {0} mergeFailed=Automatic merge failed; fix conflicts and then commit the result -mergeMadeBy=Merge made by {0} +mergeMadeBy=Merge made by the ''{0}'' strategy. metaVar_DAG=DAG metaVar_KEY=KEY metaVar_arg=ARG diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java index ac83847233..a5756cec14 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/CLIText.java @@ -74,6 +74,7 @@ public class CLIText extends TranslationBundle { /***/ public String IPZillaPasswordPrompt; /***/ public String alreadyOnBranch; + /***/ public String alreadyUpToDate; /***/ public String authorInfo; /***/ public String averageMSPerRead; /***/ public String branchAlreadyExists; diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java index da0f8b868a..eee98d409d 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Merge.java @@ -87,6 +87,8 @@ class Merge extends TextBuiltin { switch (result.getMergeStatus()) { case ALREADY_UP_TO_DATE: + out.println(CLIText.get().alreadyUpToDate); + break; case FAST_FORWARD: outw.println(result.getMergeStatus().toString()); break; |