Skip to content

Instantly share code, notes, and snippets.

@ALRubinger

ALRubinger/gist:467308

Created July 7, 2010 21:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ALRubinger/467308 to your computer and use it in GitHub Desktop.
Save ALRubinger/467308 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
[alr@alr-laptop jboss-msc]$ git remote add dml http://github.com/dmlloyd/jboss-msc.git
[alr@alr-laptop jboss-msc]$ git branch -v
* master e177206 Update to explicit property project.version
[alr@alr-laptop jboss-msc]$ git pull dml master
remote: Counting objects: 53, done.
remote: Compressing objects: 100% (19/19), done.
remote: Total 30 (delta 11), reused 0 (delta 0)
Unpacking objects: 100% (30/30), done.
From http://github.com/dmlloyd/jboss-msc
* branch master -> FETCH_HEAD
Removing src/main/java/org/jboss/msc/service/BatchBuilderBase.java
Removing src/main/java/org/jboss/msc/service/SubBatchBuilder.java
Merge made by recursive.
.../jboss/msc/service/AbstractBatchBuilder.java | 31 +++---
.../java/org/jboss/msc/service/BatchBuilder.java | 83 ++++++++++++++-
.../org/jboss/msc/service/BatchBuilderBase.java | 112 --------------------
.../org/jboss/msc/service/BatchBuilderImpl.java | 10 +--
.../org/jboss/msc/service/SubBatchBuilder.java | 31 ------
.../org/jboss/msc/service/SubBatchBuilderImpl.java | 12 ++-
.../service/BatchLevelDependenciesTestCase.java | 2 +-
.../msc/service/BatchLevelListenersTestCase.java | 2 +-
8 files changed, 106 insertions(+), 177 deletions(-)
delete mode 100644 src/main/java/org/jboss/msc/service/BatchBuilderBase.java
delete mode 100644 src/main/java/org/jboss/msc/service/SubBatchBuilder.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment