[Server-devel] XSCE/xsce and activitycetral/dxs repository integration in a branch preserving history

[Miguel González]

My suggestion to  integrate "activitycetral/dxs" into "XSCE/xsce"
preserving history and using a branch for easier comparison is:

1. revert xsce/master to fa2d59,
2. create a 'dxs' branch
3. merge activitycentral/dxs commits to this new branch preserving history

This new branch (XSCE/xsce at dxs) will be the canonical repository for the
migration and everybody will pull request against this branch.


Detailed procedure on a fresh repository
----

1. revert

Clean repo:
```
git clone git at github.com:XSCE/xsce.git
cd xsce
```

The actual revert:
```
git revert -m 1 b1638cd --no-edit
```

Submit changes:
```
git push origin
```

2. create branch

```
git branch dxs
git checkout dxs
git push origin dxs
```

3. merge

Fetch dxs repository:
```
git remote add dxs git at github.com:activitycentral/dxs
git fetch dxs
```

And now the critical part, the actual merge:
```
git merge --no-ff -s recursive -X ours --no-edit dxs/master
```

Push!
```
git push origin dxs
````

So, anyone with write permission on xsce can do this.

You can check how would be the resulting repo in my personal clone copy in
https://github.com/migonzalvar/xsce.



-- 
Miguel González
Activity Central: http://www.activitycentral.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.laptop.org/pipermail/server-devel/attachments/20131023/4589882a/attachment.html>