[Pkg-mozext-maintainers] Greasemonkey's Git Repository

[Ximin Luo]

To help this, I highly recommend everyone install and use a graphical history
viewer like gitg or gitk. When you can visualise the history, it's much easier
(for me at least) to spot incorrect/badly-done commits.

All pkg-mozext git repos should look something like this:

o Release version 3-1 to unstable[*]  <- (master), [debian/3-1]
|
o merge branch 'upstream'
|\
| o Imported upstream version 3 <- (upstream), [upstream/3]
| |
o | some debian-related edit
| |
o | some debian-related edit
| |
o | Release version 2-1 to unstable[*] <- [debian/2-1]
| |
o | merge branch 'upstream'
|\|
| o Imported upstream version 2 <- [upstream/2]
| |
o | Release version 1-1 to unstable (Closes: #ITP bug) [*] <- [debian/1-1]
| |
o | some debian-related edit
| |
o | some debian-related edit
|/
o Imported upstream version 1 <- [upstream/1]

[...]


[*]
- these commits should contain ONLY the relevant edit to debian/changelog, and
change nothing else
- conversely, changes to debian/changelog should ONLY be made to "release"
commits like this

X

On 21/02/12 16:51, Andrea Veri wrote:
> Hi,
> 
> while updating greasemonkey to the latest upstream release (0.9.17), I 
> noticed the relevant git repository being unusable, the branches were 
> not in sync, many changes on the code itself were done on the master 
> branch but not on the upstream one, some merges were done using a 
> git-hub's hosted repository and a few more.
> 
> I decided to rebase the repository with the latest available package 
> on the archive [1], and move the old repository to another place as 
> backup. [2]
> 
> Please remember that having a good git workflow can improve team's 
> work and most of all it'll avoid spending time in re-doing the repo 
> again when it becomes unusable.
> 
> Thanks,
> 
> Andrea
> 
> [1] http://anonscm.debian.org/gitweb/?p=pkg-mozext/greasemonkey.git
> [2] http://anonscm.debian.org/gitweb/?p=pkg-mozext/greasemonkey-old.git
> 
> 
> 
> This body part will be downloaded on demand.


-- 
GPG: 4096R/5FBBDBCE
https://github.com/infinity0
https://bitbucket.org/infinity0
https://launchpad.net/~infinity0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-mozext-maintainers/attachments/20120222/1c8f3e09/attachment.pgp>