[Gnu-arch-users] {arch}/+default-upstream

[Colin Walters]

Hi,

A while back we talked about what "tla star-merge" should do.  Right
now, it merges from the tree version, which isn't very useful.  So
here's a changeset which uses "{arch}/+default-upstream" if it exists;
otherwise it falls back to the tree version as before.

address@hidden
  tla
    tla--mainline
      tla--mainline--1.2

[...]
        patch-5
          use {arch}/+default-upstream for no-arg star-merge

Right now I'm just creating this file manually.

Should I also change it to just output an error if the file doesn't
exist?

signature.asc
Description: This is a digitally signed message part