d289a222d5
simpler merge
...
Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suitable for mergeing into the user's repo. No need for
manual diff, which can fail on eg, binaries or no changes.
2014-08-19 17:54:49 -04:00
adf8b2ec34
need to connect up history
2014-08-19 17:51:34 -04:00
6f8f0c1c6b
beargN
2014-08-19 17:34:25 -04:00
7a34a1efbf
merge from master
2014-08-19 17:33:00 -04:00
215a8e7f0e
merge from master
2014-08-19 17:31:09 -04:00
4766442124
bleargh45678etc
2014-08-19 17:30:10 -04:00
5365334ac2
double bleargh
2014-08-19 17:24:13 -04:00
d366e5e525
bleargh
2014-08-19 17:22:14 -04:00
7c558cfad1
oh, can't use cabal sdist --list-sources
...
Doesn't work when using ./Setup as cabal
2014-08-19 17:19:28 -04:00
1bf736293d
syntax
2014-08-19 17:17:36 -04:00
7743da0c3d
syntax
2014-08-19 17:17:01 -04:00
fc967dfa4c
oops, can't rely on a git repo when building debian package..
2014-08-19 17:15:58 -04:00
d54ee6c336
color message
2014-08-19 17:12:57 -04:00
f72a1aa690
fixes
2014-08-19 17:09:11 -04:00
371f6077fd
prep release
2014-08-19 17:00:49 -04:00
7c0e2125a2
fix
2014-08-19 16:58:35 -04:00
32ca119859
fix
2014-08-19 16:57:26 -04:00
b9f1e87604
use git archive, rather than cabal sdist for making single-commit git repo
...
This makes the symlinks be preserved, which it seems cabal does not do.
2014-08-19 16:55:44 -04:00
1ada0f1014
fix ref name
2014-08-19 16:47:00 -04:00
4ae9578e36
head file will end with a newline
2014-08-19 16:44:51 -04:00
3c61c109fb
ugly workaround for lack of history in repo distributed with debian package
2014-08-19 16:40:04 -04:00
e0bbb776bf
final fixes
2014-08-19 15:29:32 -04:00
882872b1ec
typo
2014-08-19 15:24:18 -04:00
8e45b0f77b
warnings
2014-08-19 15:23:29 -04:00
1830f501ee
debian upgrade handling
...
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version is available from origin.
2014-08-19 15:22:42 -04:00
527ae1dc20
typo
2014-08-19 15:06:06 -04:00
71ccd256da
stop removing privdata, it's no longer in master
2014-08-19 15:04:12 -04:00
7d59dee469
local repo fully working now
2014-08-19 15:02:12 -04:00
b6c5f54741
The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.
2014-08-19 14:35:38 -04:00
c3c1f921bb
upgrade note
2014-08-19 14:17:04 -04:00
1ed98cc755
Included the config.hs symlink to config-simple.hs in the cabal and Debian packages.
2014-08-19 14:16:53 -04:00
f162c629e4
update
2014-08-19 12:33:29 -04:00
f727bceb75
propellor spin
2014-08-13 16:52:32 -04:00
5011529def
propellor spin
2014-08-13 16:31:35 -04:00
9d2cc7774b
prep release
2014-08-04 01:12:34 -04:00
261ed396fe
propellor spin
2014-07-23 12:49:38 -04:00
08a3c52017
propellor spin
2014-07-23 12:48:46 -04:00
6cf770c699
propellor spin
2014-07-23 12:45:04 -04:00
02d7e6d5c6
changelog
2014-07-23 12:43:30 -04:00
8fc3b61431
propellor spin
2014-07-23 12:42:17 -04:00
db7c012c1a
propellor spin
2014-07-23 12:41:53 -04:00
74e28cb6b4
propellor spin
2014-07-23 12:41:39 -04:00
359f13323d
propellor spin
2014-07-23 12:39:11 -04:00
ac46ab4d0c
propellor spin
2014-07-23 12:33:44 -04:00
3d617fd98b
propellor spin
2014-07-23 12:33:11 -04:00
41a23743e7
propellor spin
2014-07-23 12:27:38 -04:00
de50ea480d
propellor spin
2014-07-23 12:26:24 -04:00
dd32a63a07
propellor spin
2014-07-23 12:25:38 -04:00
ecc275cfeb
propellor spin
2014-07-23 12:23:44 -04:00
d393b8fc53
propellor spin
2014-07-23 11:58:32 -04:00
Joey Hess