Wiki

Clone wiki

satchmo-prehistory / Home

Satchmo prehistory

It is a repository with 2064 commits which are an important source for Satchmo development in addition to the main repository.

Satchmo *Mercurial* repository starts on 2007-11-02 (without the first 860 svn commits), but the first part contains only changes in the trunk and big merges to trunk when any development branch is closed.

Complete part of repository in mercurial starts on 2009-01-02 by the last huge merge from prehistory 811:f2bc6a4a9ce9 which is r1863 in svn.

Issues before #819 are related to changeset numbering of svn repository (="prehistory") Their date of creation is false 2009-06-12 and date of comments 2009-06-05 because it is the same date and many od them has been fixed before.

Using

Satchmo-prehistory must be cloned to local and searched by advanced ways. Because SVN has a linear history and branches ale started by copying the whole tree of Satchmo, it is important to know how to restrict the output.

Restriction by "keyword" is the most useful because the the path have been changed many times.

Example: What are important changes related to Fedex?

File or directory or comment containing the strig "fedex" in trunk.

hg log -v -r "keyword(trunk) and keyword(fedex)" | less

Hmm, there is also unimportant merge with comment "from trunk" and I see that it was after move from /trunk to /satchmo/trunk.

cd ..path..to/satchmo/trunk
hg log -v -r "keyword(fedex) and not keyword(merge)" . | less

Finally I want to see some diff restricted to important

hg log -v -r "keyword(fedex) and not (keyword(merg) or keyword(branching) or keyword(moving) or keyword(tag))" -p | less -I}}}

History of branches

  • Branches in the "/tags/" directory are not important. Only a snaphot of trunk
  • Numbers of the first an last commit in this branch are separated by ":"
  • If the range of commits overlaps a branch started later, it is marked by "*"
== ../trunk/satchmo
0:225
== trunk/satchmo
*226:2055
== product-model-refactor
*260:542
== payment-refactor
*313:340:362
== unicode
*354:479
== registration
413:474
== tags/0.5/satchmo
674
== configuration
745:759
== tags/0.6/satchmo
855
== branches/0.6-bugfixes/satchmo
997:1000
== tags/0.7/satchmo
1223:1227
== branches/nfa/satchmo
1255:1347
== branches/multi-shop/satchmo
1363:1422
== branches/0.7-bugfixes/satchmo
1502:1503
== tags/0.8/satchmo
1729
== branches/module-reorg/satchmo
1736:1862
== tags/0.8.1/satchmo
1833
== branches/0.8.1-bugfixes/satchmo
1866:2064
== tags/pre-payment-refactor/satchmo
1972

Every commit modifies files only in one "branch".

Updated