lp:~wallyworld/bzr4j/track-submit-changes

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:bzr4j

Patrick Woodworth: Pending requested 2012-01-17

Diff: 476 lines (+181/-52)

9 files modified

modules/core/src/main/java/org/emergent/bzr4j/core/cli/BzrAbstractExec.java (+1/-1)
modules/core/src/main/java/org/emergent/bzr4j/core/cli/CmdContext.java (+1/-1)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/BzrProjectSettings.java (+27/-0)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/command/BzrMiscCommand.java (+12/-0)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/provider/BzrChangeProvider.java (+11/-1)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.form (+47/-5)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrConfigurationProjectPanel.java (+62/-15)
modules/intellij/src/main/java/org/emergent/bzr4j/intellij/ui/BzrSwitchDialog.java (+19/-29)
modules/intellij/src/main/resources/org/emergent/bzr4j/intellij/BzrVcsMessages.properties (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

61. By Ian Booth on 2012-01-17

Merge in latest trunk and add support for tracking against ancestor branches

60. By Francis Devereux on 2011-12-18

Update <change-notes> in plugin.xml and bump version to 2.6.2-SNAPSHOT

59. By Francis Devereux on 2011-12-18

Add methods to BzrAnnotation to fix compilation against IntelliJ IDEA 11.0

58. By Francis Devereux on 2011-12-18

Add Set<String> feedback argument to BzrCheckinEnvironment.commit so that it compiles against IntelliJ IDEA 11.0

57. By Francis Devereux on 2011-12-18

Form changes made automatically when building with IntelliJ 11.0

56. By Francis Devereux on 2011-12-18

Update BzrFileRevision to compile against IntelliJ IDEA 11.0 SDK and to use ContentRevisionCache

55. By Francis Devereux on 2011-12-18

VcsUtil.showErrorMessage has moved to VcsImplUtil

54. By Francis Devereux on 2011-02-23

Fixed IDEA 10 (latest git as of 14 Feb 2011) compile errors

53. By Patrick Woodworth on 2011-02-15

Fix for bug 716279.

52. By Patrick Woodworth on 2011-02-15

Merging changes for 2.6.0 release.