Context Navigation

← Previous Ticket
Next Ticket →

Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.

Notice: In order to edit this ticket you need to be either: a Product Owner, The owner or the reporter of the ticket, or, in case of a Task not yet assigned, a team_member"

Task #7271 (closed)

Opened 12 years ago

Closed 12 years ago

django_1_3_1 branch usage strategy

Reported by:	cxallan	Owned by:	cxallan
Priority:	blocker	Milestone:	OMERO-4.4
Component:	Web	Version:	n.a.
Keywords:	n.a.	Cc:	python-team@…
Resources:	n.a.	Referenced By:	n.a.
References:	n.a.	Remaining Time:	0.0d
Sprint:	2011-11-29 (3)

Description

With the completion of #7117 we need a branch and merge strategy for those who need to work against Django 1.3.1 until such a time as the django_1_3_1 branch is merged in to develop.

References

Referenced by:
← User Story (#7116): Review of Django and dependencies

Change History (2)

comment:1 Changed 12 years ago by cxallan

Status changed from new to accepted

comment:2 Changed 12 years ago by cxallan

Remaining Time changed from 0.25 to 0
Resolution set to fixed
Status changed from accepted to closed

Initial two strategies

If you just need Django 1.3.1 and do not need the latest develop

# Example remote names and GitHub URIs
# gh-chris-allan	git://github.com/chris-allan/openmicroscopy.git (push)
# gh-chris-allan	git://github.com/chris-allan/openmicroscopy.git (fetch)
git checkout -b <your_feature_branch_name> gh-chris-allan/django_1_3_1

If you need Django 1.3.1 and the latest develop

# Example remote names and GitHub URIs
# origin	ssh://git.openmicroscopy.org/home/git/ome.git (push)
# origin	ssh://git.openmicroscopy.org/home/git/ome.git (fetch)
# gh-chris-allan	git://github.com/chris-allan/openmicroscopy.git (push)
# gh-chris-allan	git://github.com/chris-allan/openmicroscopy.git (fetch)
git checkout -b <your_feature_branch_name> origin/develop
git merge --no-ff gh-chris-allan/django_1_3_1

Both of these strategies have been merge tested against develop, progressing and not progressing, and to be able to work in tandem. Not everyone has to use the same strategy to have their branches merge cleanly. If anyone has existing branches that they need to get to a state where they are using either strategy Josh or I can help them do so.

Note: See TracTickets for help on using tickets. You may also have a look at Agilo extensions to the ticket.

Download in other formats: