1. Tamas Kovacs
  2. slimv
  3. Pull requests

Pull requests

#3 Declined

slimv.txt has three minor linkage problems

  1. Aaron Brooks

Firstly, thanks for your excellent project!

The "slimv_options" and "slimv_keyboard" targets were not consistent with the other documentation sections and did not match (most) of the links to them. This patch fixes those issues.

Let me know if there's anything you want me to change.

Comments (7)

  1. Tamas Kovacs repo owner

    Hi, and thanks for the fix. Unfortunately hg does not allow to pull it, probably because there's been a change in slimv.txt since. Please try to merge the default head first.

  2. Aaron Brooks author

    Just to let you know, this will be a problem until you merge the following heads to get rid of them:

    abrooks@deadeater ~/play/slimv $ hg heads
    changeset:   807:e393fb1be6fc
    tag:         tip
    parent:      805:e1586a945e11
    parent:      806:e8e2f694fe86
    user:        Aaron Brooks <aaron@brooks1.net>
    date:        Wed Oct 26 09:52:17 2011 -0400
    summary:     Merging with upstream.
    changeset:   768:8b6253ec5241
    branch:      slimv090
    parent:      766:d14410ce5085
    user:        Tamas Kovacs <kovisoft@gmail.com>
    date:        Sat Oct 01 22:52:55 2011 +0200
    summary:     Closing branch slimv090
    changeset:   592:b9356b22ff8d
    branch:      swank
    parent:      590:9ace82c29767
    user:        Tamas Kovacs <kovisoft@gmail.com>
    date:        Thu Mar 24 23:14:49 2011 +0100
    summary:     Closing branch swank
    changeset:   105:b1f1ed0c6ad1
    user:        Tamas Kovacs <kovisoft@gmail.com>
    date:        Wed Feb 11 15:44:26 2009 +0100
    summary:     Version 0.1.1

    It seems like a good idea to merge those away so you can use the pull requests tool. Either that or I might suggest git (if you're open to that) which doesn't suffer from the problems induced by multiple-heads.