FAQ
Does p4 have a SCCS like 'unedit' command?

--
H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/)
using perl-5.6.1, 5.8.0 & 633 on HP-UX 10.20 & 11.00, AIX 4.2, AIX 4.3,
WinNT 4, Win2K pro & WinCE 2.11. Smoking perl CORE: smokers@perl.org
http://archives.develooper.com/daily-build@perl.org/ perl-qa@perl.org
send smoke reports to: smokers-reports@perl.org, QA: http://qa.perl.org

Search Discussions

  • Jarkko Hietaniemi at Sep 10, 2002 at 1:40 pm
    Does p4 have a SCCS like 'unedit' command?
    "p4 revert", see "p4 help revert" (for discarding any changes, and
    closing ("unediting", I guess) the file), or maybe "p4 sync -f" (for
    forcefully syncing your working copy from the repository, discarding
    any changes, works only on closed files, not open ones), see "p4 help sync".

    --
    Jarkko Hietaniemi <jhi@iki.fi> http://www.iki.fi/jhi/ "There is this special
    biologist word we use for 'stable'. It is 'dead'." -- Jack Cohen
  • H.Merijn Brand at Sep 10, 2002 at 4:16 pm

    On Tue 10 Sep 2002 15:39, Jarkko Hietaniemi wrote:
    Does p4 have a SCCS like 'unedit' command?
    "p4 revert", see "p4 help revert" (for discarding any changes, and
    closing ("unediting", I guess) the file), or maybe "p4 sync -f" (for
    forcefully syncing your working copy from the repository, discarding
    any changes, works only on closed files, not open ones), see "p4 help sync".
    I just did 'p4 edit' to one file too many (I already changed it and submitted
    it as a test case) and didn't change it (yet).

    So I found no commands in the list to unedit. Mind you, there were no changes
    (yet) to revert. It was not bad, because more (and more) reading made me
    decide to put yet another piece of text in that file, so it had to change
    anyway.

    Andy's changes to the doc's are in as 17889 and 17890

    --
    H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/)
    using perl-5.6.1, 5.8.0 & 633 on HP-UX 10.20 & 11.00, AIX 4.2, AIX 4.3,
    WinNT 4, Win2K pro & WinCE 2.11. Smoking perl CORE: smokers@perl.org
    http://archives.develooper.com/daily-build@perl.org/ perl-qa@perl.org
    send smoke reports to: smokers-reports@perl.org, QA: http://qa.perl.org
  • Jarkko Hietaniemi at Sep 11, 2002 at 1:02 am
    One thing to do is to add nanosleep() probe (the CPAN version of
    Time::HiRes uses it). I actually think the d_nanosleep.U is there
    and ready, the HAS_NANOSLEEP will just have to be mentioned somewhere
    (the end of perl.h is conventional) when Configure is rebuilt for
    the next time.

    --
    Jarkko Hietaniemi <jhi@iki.fi> http://www.iki.fi/jhi/ "There is this special
    biologist word we use for 'stable'. It is 'dead'." -- Jack Cohen
  • H.Merijn Brand at Sep 10, 2002 at 5:15 pm

    On Tue 10 Sep 2002 17:26, H.Merijn Brand wrote:

    Actions to do:

    + finish my YAPC talk
    + create a short (perl) script that shows me the unit
    out of the Configure diff
    l1:/pro/3gl/CPAN 127 > diff2unit.pl 17011 17041 17097 17156 17239 17278 17339 17489 17522 17671 17698 17715 17731 17739 17827 17866 17879
    Reading Units 528
    17011/ 1
    17011/ 2
    17041/ 1
    17097/ 1
    17156/ 1
    17239/ 1
    17278/ 1
    17278/ 2
    17339/ 1
    17489/ 1
    17489/ 2
    17489/ 3
    17522/ 1
    17671/ 1
    17671/ 2
    17671/ 3
    17671/ 4
    17671/ 5
    17671/ 6
    17671/ 7
    17698/ 1 Extensions.U
    17715/ 1 d_modfl.U
    17715/ 2 d_modfl.U
    17715/ 3
    17731/ 1
    17731/ 2
    17739/ 1 prefix.U
    17827/ 1 usenm.U
    17827/ 2
    17866/ 1
    17879/ 1 gccvers.U
    l1:/pro/3gl/CPAN 128 >

    A good start. Andy patched in his meta-doc-patch, the .U files in
    metaconfig/dist-3.0at70b [1]

    Which files should *I* edit. the files there, or the files in metaconfig/U [2]
    and how do the files in [1] promote to [2], and how does p4 know?

    I guess that the promotion for [1] to [2] is like rebuilding metaconfig, and I
    am to p4 edit the files in 3.0at70b

    right?
    + backport the Configure changes
    + modify makedepend to `tag' the units
    + modify makedepend to incorporate Andy's CBU wishes
    + find out how those changes can actually be used :)
    --
    H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/)
    using perl-5.6.1, 5.8.0 & 633 on HP-UX 10.20 & 11.00, AIX 4.2, AIX 4.3,
    WinNT 4, Win2K pro & WinCE 2.11. Smoking perl CORE: smokers@perl.org
    http://archives.develooper.com/daily-build@perl.org/ perl-qa@perl.org
    send smoke reports to: smokers-reports@perl.org, QA: http://qa.perl.org
  • Jarkko Hietaniemi at Sep 10, 2002 at 5:21 pm

    + finish my YAPC talk
    + create a short (perl) script that shows me the unit
    out of the Configure diff
    l1:/pro/3gl/CPAN 127 > diff2unit.pl 17011 17041 17097 17156 17239 17278 17339 17489 17522 17671 17698 17715 17731 17739 17827 17866 17879
    Reading Units 528
    17011/ 1
    17011/ 2
    17041/ 1
    17097/ 1
    17156/ 1
    17239/ 1
    17278/ 1
    17278/ 2
    17339/ 1
    17489/ 1
    17489/ 2
    17489/ 3
    17522/ 1
    17671/ 1
    17671/ 2
    17671/ 3
    17671/ 4
    17671/ 5
    17671/ 6
    17671/ 7
    17698/ 1 Extensions.U
    17715/ 1 d_modfl.U
    17715/ 2 d_modfl.U
    17715/ 3
    17731/ 1
    17731/ 2
    17739/ 1 prefix.U
    17827/ 1 usenm.U
    17827/ 2
    17866/ 1
    17879/ 1 gccvers.U
    l1:/pro/3gl/CPAN 128 >

    A good start. Andy patched in his meta-doc-patch, the .U files in
    metaconfig/dist-3.0at70b [1]

    Which files should *I* edit. the files there, or the files in metaconfig/U [2]
    and how do the files in [1] promote to [2], and how does p4 know?
    You should edit [2], the metaconfig/U, since that's where Perl's
    metaconfig picks up the units to regenerate Configure and config_h.SH.
    The transfer from [1] to [2] has to be done manually. The difference
    between [1] and [2] is that [1] is the "official metaconfig tree",
    and the [2] is the modified units used to build the Perl Configure.

    (Yes, it would perhaps make sense to create, say, dist-3.1, that would
    merge back in the changes from the Perl units.)
    I guess that the promotion for [1] to [2] is like rebuilding metaconfig, and I
    am to p4 edit the files in 3.0at70b

    right?
    No. For now, edit files in [2], in metaconfig/U. If you take a look
    at metaconfig/U, you will find a lot of files that live dual lives, in
    metaconfig/U, and in 3.0at70b. The default is to prefer the
    metaconfig/U versions over the 3.0at70b versions.
    + backport the Configure changes
    + modify makedepend to `tag' the units
    + modify makedepend to incorporate Andy's CBU wishes
    + find out how those changes can actually be used :)
    --
    Jarkko Hietaniemi <jhi@iki.fi> http://www.iki.fi/jhi/ "There is this special
    biologist word we use for 'stable'. It is 'dead'." -- Jack Cohen
  • Andy Dougherty at Sep 10, 2002 at 7:43 pm

    On Tue, 10 Sep 2002, Jarkko Hietaniemi wrote:

    (Yes, it would perhaps make sense to create, say, dist-3.1, that would
    merge back in the changes from the Perl units.)
    At the time I set up these directories, that would have implied
    volunteering to take over dist maintenance. dist was still actively being
    used by at least a few folks (e.g. including Wayne Davison, maintainer of
    trn) and maintaining it and keeping the diverse users happy was not
    something I was keen to do.

    Now, it probably doesn't really matter.

    But better, I think, would be to teach metaconfig to not bother with the
    dist standard units at all, but just grab everything from the U/
    directory. (We could then make a U/std directory for standard dist units,
    if we wanted, and populate it only with those useful ones from the
    standard distribution.)

    Of course these are all ideas I've had for years but have never done
    anything with, so make of them what you will.

    --
    Andy Dougherty doughera@lafayette.edu

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupperl5-build @
categoriesperl
postedSep 10, '02 at 11:59a
activeSep 11, '02 at 1:02a
posts7
users3
websiteperl.org

People

Translate

site design / logo © 2019 Grokbase