Re: [uracoli-devel] proposed change of the directory structure

[Daniel Thiele]

Hi Axel,

great idea. Thanks for pushing things forward.
For branches related to me I did the following actions:
 - SensorNWK: merged it to default
 - xxo_display: marked as closed (hg commit --close-branch) because changes
were done that shall not appear on the mainline

Another approach instead of merging everything to mainline is:
 - do the movings you like on any branch ("hg rename uracoli/Src Src", "hg
rename uracoli/Contrib Contrib", and so on)
 - merge this into each active branch (hg merge -r {Revision that was
created on the rename branch})

I tried this on a sandbox clone and it brings you to the situation of merge
conflicts and "renamed multiple times" warnings like this:
>> note: possible conflict -
uracoli-appnotes/linuxtag2012/Src/Test/project.h was renamed 
>> multiple times to:
>>  Appnotes/linuxtag2012/Src/99_Hwtest/hwtest.h
>>  Appnotes/linuxtag2012/Src/Test/project.h

I suggest to continue with the first approach (merging everything onto
default, do the renames, go on)

Best regards
Daniel

-----Ursprüngliche Nachricht-----
Von: address@hidden
[mailto:address@hidden Im Auftrag von Axel
Wachtler
Gesendet: Sonntag, 22. April 2012 20:57
An: address@hidden
Betreff: [uracoli-devel] proposed change of the directory structure

Hi folks,

Daniel came up last week with a proposal about simplifying the directrory
structure.

Currently the repository looks so:

uracoli (hg root)
|-- uracoli
|   |-- Contrib
|   |-- Doc
|   |-- Src
|   |-- Templates
|   `-- Tools
`-- uracoli-appnotes
     |-- linuxtag2011
     |-- linuxtag2012
     |-- pydude
     |-- rfarduino
     |-- SensorNWK
     `-- sniffer

What we could do is, to move everything up one level:

uracoli (hg root)
|-- Contrib
|-- Doc
|-- Src
|-- Templates
|-- Tools
`-- Appnotes
     |-- linuxtag2011
     |-- linuxtag2012
     |-- pydude
     |-- rfarduino
     |-- SensorNWK
     `-- sniffer

The old structure was created with CVS modules, so you could selectively
choose one module (mainly uracoli) for check out. But with hg there is no
module concept any more and you have to draw the whole repository anyway (hg
clone).

This change implies, that we have to *stop* all current side branches and
moving relevant changes to "default". After the directory change we can
start with new branches.

(Plan B would be:  if there is a branch which is it worth to be kept, we can
leave for that one the old structure, but I'm not shure, how this will go
with future merges from/to that branch)

Here is a list of all current branches:

default
  - this is the mainline
SensorNWK
  - active development ongoing
  - maintained by Daniel
rel_v0.2
  - maintenance branch for 0.2.x packages, can be stopped,
    if 0.3.x release comes
  - maintained by Axel, is obsolete
xxo_display
  - tic tac toe blinken lights trial, can be merged to
    mainline and then stopped
  - Daniel, Axel
jw_debug_antenna
jw_fabian_game
jw_debug
jw_debug_keys
  - various debug branches created by Joerg,
  - we need to pick up the relevant pieces rakete
  - created in February 2012, nothing checked in
    can be stopped.

Everybody, please send your comments, warnings and other solutions on that
proposal.

Axel