Opened 10 years ago

Closed 9 years ago

Last modified 3 years ago

#479 closed porting (performed)

reintegrate branch probeSpec

Reported by: westram Owned by: westram
Priority: normal Milestone: arb7.0
Component: global Version: SVN
Keywords: Cc: pjumppanen

Description (last modified by westram)

As ​branch probeSpec is based on an old trunk version, i would suggest to

  • create a new branch from trunk (e.g. 'bpps')
  • merge separate features implemented in 'probeSpec' into 'bpps' (using separate commits)
  • reintegrate 'bpps' into trunk

Blocked by #657

Change History (10)

comment:1 follow-up: Changed 10 years ago by westram

  • Cc pjumppanen added
  • Owner changed from devel to westram

@paavo: does [11517] mean, green light for reintegration?

comment:2 Changed 10 years ago by westram

  • Type changed from task to porting

comment:3 in reply to: ↑ 1 Changed 10 years ago by westram

  • Milestone set to arb6.1
  • Version set to SVN

@paavo: does [11517] mean, green light for reintegration?

Lev asked for reintegration, so i assume "yes" :)

comment:4 Changed 9 years ago by westram

  • Owner changed from westram to pjumppanen
  • Status changed from new to assigned

comment:5 follow-up: Changed 9 years ago by pjumppanen

As probeSpec branch was branched on an old revision with many changes checked in since, merging would be painful. I Created a new branch (ProbeMatchCollection?) and re-implemented the feature there. It is all in place and working now.

Will Ralf do the merge or should I?

comment:6 in reply to: ↑ 5 Changed 9 years ago by westram

  • Owner changed from pjumppanen to westram

Replying to pjumppanen:

I Created a new branch (ProbeMatchCollection?) and re-implemented the feature there. It is all in place and working now.

Great.

Will Ralf do the merge or should I?

I need to get it to compile on our build server first.

comment:7 Changed 9 years ago by westram

  • Status changed from assigned to _started

comment:8 Changed 9 years ago by westram

  • Description modified (diff)

comment:9 Changed 9 years ago by westram

  • Resolution set to performed
  • Status changed from _started to closed

by [13923]

comment:10 Changed 3 years ago by westram

  • Milestone changed from arb6.1 to arb7.0

Milestone renamed

Note: See TracTickets for help on using tickets.