Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync docs and config between icedtea and github #1

Closed
wants to merge 3 commits into from

Conversation

ykubota
Copy link
Member

@ykubota ykubota commented Jan 20, 2016

I will push .hgignore to icedtea for adding the below config.

# github (git)
.git*

Any thoughts?

P.S.
I will push docs, i.e., README and CONTRIBUTING.md as well.

@ykubota ykubota changed the title Update README and config to sync between icedtea and github Sync docs and config between icedtea and github Jan 20, 2016
@YaSuenag
Copy link
Member

I think .hgignore should not be ignored because it is managed by mercurial in IcedTea.

@YaSuenag
Copy link
Member

You should add .gitignore to IcedTea mercurial.
And you should add .git to .hgignore .

@ykubota
Copy link
Member Author

ykubota commented Jan 20, 2016

Thanks comment!

I think that maintainer try not to let the developers who use git bother about mercurial.
Even if .{hg|git}ignore ignore each other, maintainer can push it without affecting both.

@ykubota
Copy link
Member Author

ykubota commented Jan 20, 2016

Setting example for maintainer

/workspace/heapstats% tree -L 1 -a
.
|-- .git
|-- .gitignore
|-- .hg
|-- .hgignore
|-- .hgtags
|-- AUTHORS
|-- CONTRIBUTING.md
|-- COPYING
|-- ChangeLog
|-- INSTALL
|-- Makefile.am
|-- Makefile.in
|-- NEWS
|-- README
|-- README.md -> README
|-- aclocal.m4
|-- agent
|-- analyzer
|-- configure
|-- configure.ac
|-- m4
|-- mbean
|-- pom.xml
\-- specs

7 directories, 17 files
/workspace/heapstats% hg status
M .hgignore
M README
A CONTRIBUTING.md
/workspace/heapstats% git status
On branch sync_configs
Your branch is up-to-date with 'origin/sync_configs'.
nothing to commit, working directory clean

@YaSuenag
Copy link
Member

I think .hgignore and .gitignore should be managed by SCM.
As you say, Git user(s) does not need to modify .hgignore . However, we should synchronze them each other.

Currently, we manage same trunk source code at GitHub and IcedTea HG, and we should synchronize them each other. ignore files are managed at both SCM as material.
Thus I think all materials should be managed both SCM.

If we update ignore entry, we have to update both files and they are should be managed.
(I will send PR to add heapstats-cli shell to each ignore file.)

@ykubota
Copy link
Member Author

ykubota commented Jan 20, 2016

OK, your thought looks reasonable to me.

Shall we create a symbolic link for .{git,hg}ignore ?

  • Pros
    • We change only 1 file when we need to change.
  • Cons
    • We need to track .hgtags, too.

@YaSuenag
Copy link
Member

Okay if it is possible.
However, it might be different syntax.

For example, target directories in analyzer are NOT ignored at Git. HG ignores them. You have to check git status after build all make target.

@ykubota
Copy link
Member Author

ykubota commented Jan 21, 2016

Good point! I create a symbolic link, .ignore, and update it to fill a gap between hg and git.
Please check it.

  • the result of status after ./configure; make all
/workspace/heapstats% git status
On branch sync_configs
Your branch is up-to-date with 'origin/sync_configs'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        typechange: .gitignore
        new file:   .hgignore
        new file:   .hgtags
        copied:     .gitignore -> .ignore

/workspace/heapstats% hg status
M .hgignore
M README
A .gitignore
A .ignore
A CONTRIBUTING.md
  • tree of analyzer (after ./configure; make all)
/workspace/heapstats% tree analyzer/ -L 3
analyzer/
|-- cli
|   |-- heapstats-cli
|   |-- heapstats-cli.in
|   |-- pom.xml
|   |-- src
|   |   `-- main
|   `-- target
|       |-- archive-tmp
|       |-- classes
|       |-- generated-sources
|       |-- heapstats-cli-2.0-bin
|       |-- heapstats-cli-2.0-bin.zip
|       |-- heapstats-cli.jar
|       |-- maven-archiver
|       `-- maven-status
|-- core
|   |-- pom.xml
|   |-- src
|   |   `-- main
|   `-- target
|       |-- classes
|       |-- generated-sources
|       |-- heapstats-core.jar
|       |-- maven-archiver
|       `-- maven-status
`-- fx
    |-- THIRD_PARTY_README
    |-- filterDefine.xsd
    |-- heapstats.properties
    |-- lib
    |   `-- jgraphx.jar
    |-- nbactions.xml
    |-- pom.xml
    |-- src
    |   `-- main
    `-- target
        |-- archive-tmp
        |-- classes
        |-- generated-sources
        |-- heapstats-analyzer-2.0-bin
        |-- heapstats-analyzer-2.0-bin.zip
        |-- heapstats-analyzer.jar
        |-- maven-archiver
        `-- maven-status

29 directories, 15 files

@YaSuenag
Copy link
Member

Good! You can merge it!

@ykubota
Copy link
Member Author

ykubota commented Jan 21, 2016

Thank for reviewing !

I will merge to here and icedtea :-)

@ykubota ykubota closed this in 5da91f0 Jan 21, 2016
@ykubota ykubota deleted the sync_configs branch January 23, 2016 11:00
@ykubota ykubota self-assigned this Feb 3, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants