On 22 July 2015 at 07:47, Andy Bradford <[email protected]> wrote: > Thus said Michai Ramakers on Wed, 22 Jul 2015 00:48:03 +0200: > >> If I then move B to new branch 'parked-here', then move D (back) to >> trunk, then close leaf A, is the result something that could cause >> problems later on? (If so, which ones?) > > I don't see how it could. I tried just that, created 4 checkins against > the same node in the timeline (say Z), and then moved B and C to > branches and closed A. D is the only thing left on trunk and it seems to > work fine. > > By the way, if D is already a separate check-in against trunk, there is > no need to move it back to trunk because it is already a fork of trunk. > > Otherwise, what you mean by ``move D (back) to trunk?''
ok, thx for checking. I was unclear - what I did was this: [before] 10:49:31 [5cc5ed081d] *CURRENT* D (user: michai tags: trunk) 10:49:28 [d5afaba2f3] C (user: michai tags: trunk) 10:49:26 [ed0b14f29b] B (user: michai tags: trunk) 10:49:23 [669bef972a] A (user: michai tags: trunk) 10:48:33 [50a76c0cd9] initial empty check-in (user: michai tags: trunk) +++ no more data (5) +++ [after] 10:50:48 [e8784f9d92] Edit [669bef972a21cbd3|669bef972a]: Marked "Closed". (user: michai) 10:50:33 [5e39682327] Edit [5cc5ed081d495706|5cc5ed081d]: Move to branch [/timeline?r=trunk&nd&dp=5cc5ed081d495706&unhide | trunk]... (user: michai) 10:50:05 [383684cb91] Edit [ed0b14f29b3a2c72|ed0b14f29b]: Move to branch [/timeline?r=parked-here&nd&dp=ed0b14f29b3a2c72&unhide | parked-here]... (user: michai) 10:49:31 [5cc5ed081d] *CURRENT* D (user: michai tags: trunk) 10:49:28 [d5afaba2f3] C (user: michai tags: parked-here) 10:49:26 [ed0b14f29b] B (user: michai tags: parked-here) 10:49:23 [669bef972a] A (user: michai tags: trunk) 10:48:33 [50a76c0cd9] initial empty check-in (user: michai tags: trunk) +++ no more data (8) +++ so... B and C are both on a shared branch, and A and D are on trunk (where A is closed to avoid multiple open leaves on trunk). I used '--branch' and '--close' options of 'fossil amend' for this. Michai _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
