• Log graph

Commits in parsecvs/mainline:merge-flat

• Monday March 20 2006

  • 20:42

    

    Keith Packard committed 577a28f

    Sort branches by degree

  • 06:25

    

    Keith Packard committed 49431fd

    Rename "ent" to "commit"

  • 04:48

    

    Keith Packard committed b968489

    Eliminate separate branch structure, just use heads

• Saturday March 18 2006

  • 07:55

    

    Keith Packard committed 6921311

    Lots of validation and random changes trying to make things work

• Friday March 17 2006

  • 08:44

    

    Keith Packard committed 39d498e

    Allow branch structs to be "tail" of branch (i.e., no revisions). Retain strict branch ordering during merging

  • 07:59

    

    Keith Packard committed 5ebe395

    Clean up leaked rev_files associated with dead revisions

  • 07:05

    

    Keith Packard committed 6b5cc21

    Fix vendor branch merging to match CVS semantics. add plain ascii dump format.

  • 02:39

    

    Keith Packard committed 4321834

    Support deleted files by recognizing dead revisions

• Monday March 13 2006

  • 21:56

    

    Keith Packard committed 9b6a53b

    Free rev_file objects at exit

  • 09:18

    

    Keith Packard committed 26d5eaa

    Add README

  • 08:51

    

    Keith Packard committed 30276c9

    Remove extraneous branch-reparenting merge code.

  • 06:59

    

    Keith Packard committed 9f3c0bf

    Deal with two digit dates. avoid printing non-ascii chars

  • 04:38

    

    Keith Packard committed 8c0118b

    Replace per-ent linked list of files with array of pointers to shared objects

  • 03:29

    

    Keith Packard committed b6066a4

    Performance and memory leak work

  • 00:34

    

    Keith Packard committed d3fe5f5

    Move cvs->rev code to separate file

  • 00:29

    

    Keith Packard committed 4153659

    Blend vendor and head into a single branch, discard text content, avoid duplicate tags

• Sunday March 12 2006

  • 23:23

    

    Keith Packard committed 8aa44c3

    Atomize strings, eliminate allocation for numbers, do binary merge

• Saturday March 11 2006

  • 09:02

    

    Keith Packard committed 013bf51

    Read filenames from stdin if no args. discard merged list after merge operation

  • 08:24

    

    Keith Packard committed 5a54884

    successful merge of small sets of files.

• Friday March 10 2006

  • 19:34

    

    Keith Packard committed 6ee6493

    Split out branch grafting to separate function

  • 08:12

    

    Keith Packard committed 6b35fb7

    dont crash if vendor is missing

  • 07:44

    

    Keith Packard committed 8bf9431

    Use dates to merge vendor branch to trunk

  • 06:27

    

    Keith Packard committed fdcb64f

    Get revlist generation working, display output with graphviz

  • 01:12

    

    Keith Packard committed c5148b7

    Add code to compute tree from cvs file

• Thursday March 09 2006

  • 07:52

    

    Keith Packard committed bdf36e3

    initial cut at CVS file parser