Opened 3 years ago

Closed 3 years ago

#26 closed defect (fixed)

renaming branch 0.10 to trunk

Reported by: diver Owned by: komh
Priority: minor Milestone: GA
Component: IFS Version:
Severity: low Keywords:
Cc: lgrosenthal@…, komh@…

Description

as the branch/0.10 includes all changes from trunk and a lot fixes, I vote for renaming branch/0.10 to trunk. Of course the current trunk should be copied to branch first.

Change History (9)

comment:1 Changed 3 years ago by lewisr

  • Cc lgrosenthal@… added

Email sent to KO to solicit his input, here.

comment:2 Changed 3 years ago by komh

  • Cc komh@… added
  • Owner set to komh
  • Priority changed from blocker to minor
  • Severity changed from medium to low
  • Status changed from new to accepted

If so, correct process is to merge 0.10 branch to trunk. So, I don't agree.

However, because 0.10 branch is maintained by valerius(Valery), and trunk has many contributions from erdmann(Lars), if they agree to do this, it would be fine.

Unfortunately, I have no idea to invite them to this discussion. Anyone can do this ?

comment:3 Changed 3 years ago by lewisr

Email sent to Lars for comment.

comment:4 Changed 3 years ago by erdmann

I have no objections to make the 0.10 branch the trunk. But as diver suggested I propose to make the currently existing trunk a branch so that we always have a chance to look back in time.

comment:5 Changed 3 years ago by komh

How about Valery ?

comment:6 Changed 3 years ago by valerius

I merged trunk with 0.10, so now 0.10 should contain all changes from trunk, including Lars' changes to FS_MOUNT and FS_WRITE and komh's changes to cache code. (But I commented-out several questionable edits, and temporarily disabled the cache code init, because it hangs on the semaphore with branch 0.10 code). So, I am not against of renaming 0.10 to trunk, if Lars and komh agreed (If there will be no conflicts. For example, I added the up to 4 gb file support, and up to 64 kb clusters support to my branch, and plan to convert fat32.ifs to a 32-bit IFS in the future, so, others may not argee...)

Last edited 3 years ago by valerius (previous) (diff)

comment:7 Changed 3 years ago by komh

Oh, good...

I'll rename 0.10 branch to trunk, and trunk to trunk-old branch, soon.

Any objections ?

comment:8 Changed 3 years ago by diver

nope as thats what I proposed go ahead asap.

comment:9 Changed 3 years ago by komh

  • Resolution set to fixed
  • Status changed from accepted to closed

Done by r165 and r166.

Switch your working copy correctly.

Note: See TracTickets for help on using tickets.